diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
index 83c0bed..4388a12 100644
--- a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
@@ -19,8 +19,8 @@ function renderManagePage() {
     global $default;
     
     // retrieve subscriptions for this user
-    $aFolderSubscriptions = SubscriptionManager::retrieveSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("FolderSubscription"));
-    $aDocumentSubscriptions = SubscriptionManager::retrieveSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("DocumentSubscription"));    
+    $aFolderSubscriptions = SubscriptionManager::retrieveUserSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("FolderSubscription"));
+    $aDocumentSubscriptions = SubscriptionManager::retrieveUserSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("DocumentSubscription"));    
     $bNoSubscriptions  = ( (count($aFolderSubscriptions) == 0) && (count($aDocumentSubscriptions) == 0) ) ? true : false; 
 
 	$sToRender  = "<table>\n";
diff --git a/tests/subscriptions/subscriptionManager.php b/tests/subscriptions/subscriptionManager.php
index 9d2cae3..98e1ced 100644
--- a/tests/subscriptions/subscriptionManager.php
+++ b/tests/subscriptions/subscriptionManager.php
@@ -63,11 +63,11 @@ if (checkSession()) {
 
     // now try to retrieve them
     echo "<li>folder subscriptions for userID=$iUserID:";
-    $aFolders = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("FolderSubscription"));
+    $aFolders = $oSubscriptionManager->retrieveUserSubscriptions($iUserID, SubscriptionConstants::subscriptionType("FolderSubscription"));
     echo "<pre>" . arrayToString($aFolders) . "</pre></li>";
 
     echo "<li>document subscriptions for userID=$iUserID:";
-    $aDocuments = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("DocumentSubscription"));
+    $aDocuments = $oSubscriptionManager->retrieveUserSubscriptions($iUserID, SubscriptionConstants::subscriptionType("DocumentSubscription"));
     echo "<pre>" . arrayToString($aDocuments) . "</pre></li>";
 
     // now try retrieving both