diff --git a/livesupport/src/modules/core/include/LiveSupport/Core/AudioClip.h b/livesupport/src/modules/core/include/LiveSupport/Core/AudioClip.h
index e9c6b1a01..99f9da445 100644
--- a/livesupport/src/modules/core/include/LiveSupport/Core/AudioClip.h
+++ b/livesupport/src/modules/core/include/LiveSupport/Core/AudioClip.h
@@ -311,8 +311,8 @@ class AudioClip : public Configurable,
          *                                              //   storage client
          *  </code></pre>
          *
-         *  @see Storage::StorageClientFactory
-         *  @see Storage::StorageClientInterface
+         *  @see StorageClient::StorageClientFactory
+         *  @see StorageClient::StorageClientInterface
          *
          *  @param playlength the playing length of the audio clip.
          *  @param title      the title of the audio clip.
diff --git a/livesupport/src/modules/core/include/LiveSupport/Core/Playlist.h b/livesupport/src/modules/core/include/LiveSupport/Core/Playlist.h
index 3193522ab..6a156fcc3 100644
--- a/livesupport/src/modules/core/include/LiveSupport/Core/Playlist.h
+++ b/livesupport/src/modules/core/include/LiveSupport/Core/Playlist.h
@@ -353,8 +353,8 @@ class Playlist : public Configurable,
          *          playlist = storageClient->createPlaylist(sessionId);
          *  </code></pre>
          *
-         *  @see Storage::StorageClientFactory
-         *  @see Storage::StorageClientInterface
+         *  @see StorageClient::StorageClientFactory
+         *  @see StorageClient::StorageClientInterface
          */
         Playlist(void)                          throw ()
                         : Playable(PlaylistType)
diff --git a/livesupport/src/products/gLiveSupport/src/AdvancedSearchEntry.h b/livesupport/src/products/gLiveSupport/src/AdvancedSearchEntry.h
index d1229dc4f..a8568b750 100644
--- a/livesupport/src/products/gLiveSupport/src/AdvancedSearchEntry.h
+++ b/livesupport/src/products/gLiveSupport/src/AdvancedSearchEntry.h
@@ -119,7 +119,7 @@ class AdvancedSearchEntry : public Gtk::VBox,
         /**
          *  Return the current state of the search fields.
          *
-         *  @return a new LiveSupport::Storage::SearchCriteria instance,
+         *  @return a new LiveSupport::StorageClient::SearchCriteria instance,
          *          which contains the data entered by the user
          */
         Ptr<SearchCriteria>::Ref
diff --git a/livesupport/src/products/gLiveSupport/src/AdvancedSearchItem.h b/livesupport/src/products/gLiveSupport/src/AdvancedSearchItem.h
index 4a5403cbb..ddfc7da9f 100644
--- a/livesupport/src/products/gLiveSupport/src/AdvancedSearchItem.h
+++ b/livesupport/src/products/gLiveSupport/src/AdvancedSearchItem.h
@@ -152,7 +152,7 @@ class AdvancedSearchItem : public Gtk::HBox,
         /**
          *  Return the current state of the search fields.
          *
-         *  @return a new LiveSupport::Storage::SearchCriteria instance,
+         *  @return a new LiveSupport::StorageClient::SearchCriteria instance,
          *          which contains the data entered by the user
          */
         Ptr<SearchCriteria::SearchConditionType>::Ref
diff --git a/livesupport/src/products/gLiveSupport/src/BrowseEntry.h b/livesupport/src/products/gLiveSupport/src/BrowseEntry.h
index c8cc5f843..9cfac64c7 100644
--- a/livesupport/src/products/gLiveSupport/src/BrowseEntry.h
+++ b/livesupport/src/products/gLiveSupport/src/BrowseEntry.h
@@ -115,7 +115,7 @@ class BrowseEntry : public Gtk::HBox,
         /**
          *  Return the current state of the search fields.
          *
-         *  @return a new LiveSupport::Storage::SearchCriteria instance,
+         *  @return a new LiveSupport::StorageClient::SearchCriteria instance,
          *          which contains the data entered by the user
          */
         Ptr<SearchCriteria>::Ref
diff --git a/livesupport/src/products/gLiveSupport/src/BrowseItem.h b/livesupport/src/products/gLiveSupport/src/BrowseItem.h
index 9c881fbe0..a0faafdac 100644
--- a/livesupport/src/products/gLiveSupport/src/BrowseItem.h
+++ b/livesupport/src/products/gLiveSupport/src/BrowseItem.h
@@ -206,7 +206,7 @@ class BrowseItem : public Gtk::VBox,
          *  with the search condition showing the current selection added
          *  (if any).
          *
-         *  @return a new LiveSupport::Storage::SearchCriteria instance,
+         *  @return a new LiveSupport::StorageClient::SearchCriteria instance,
          *          which contains the data entered by the user
          */
         Ptr<SearchCriteria>::Ref
diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h
index e98d95f4a..7b0162f8b 100644
--- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h
+++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h
@@ -935,7 +935,8 @@ class GLiveSupport : public LocalizedConfigurable,
          *
          *  @param criteria the search conditions to use.
          *  @return the list of audio clips and playlists found.
-         *  @exception XmlRpcException passed on from Storage::search()
+         *  @exception XmlRpcException thrown by 
+         *                             StorageClientInterface::search()
          */
         Ptr<PlayableList>::Ref
         search(Ptr<SearchCriteria>::Ref     criteria)
@@ -957,7 +958,8 @@ class GLiveSupport : public LocalizedConfigurable,
          *  @param metadata the type of metadata to list (e.g., "dc:title").
          *  @param criteria the search conditions to use.
          *  @return the list of metadata values found.
-         *  @exception XmlRpcException passed on from Storage::browse()
+         *  @exception XmlRpcException thrown by
+         *                             StorageClientInterface::browse()
          */
         Ptr<std::vector<Glib::ustring> >::Ref
         browse(Ptr<const Glib::ustring>::Ref        metadata,