11 files changed, 14 insertions, 14 deletions
diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index 1768928..2314b75 100644
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -1,9 +1,9 @@
 <?php
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
-$cdservice =SemanticScuttle_Service_Factory::getServiceInstance('CommonDescription');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$tagservice =SemanticScuttle_Service_Factory::get('Tag');
+$cdservice =SemanticScuttle_Service_Factory::get('CommonDescription');
 
 
 $pageName = isset($pageName)?$pageName:"";
diff --git a/data/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php
index c1a589f..b18565b 100644
--- a/data/templates/dynamictags.inc.php
+++ b/data/templates/dynamictags.inc.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 /* Service creation: only useful services are created */
-$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
+$b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 
diff --git a/data/templates/sidebar.block.common.php b/data/templates/sidebar.block.common.php
index 7fbc782..951ed80 100644
--- a/data/templates/sidebar.block.common.php
+++ b/data/templates/sidebar.block.common.php
@@ -1,5 +1,5 @@
 <?php
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 $commonTags =& $b2tservice->getRelatedTagsByHash($hash);
 $commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc');
 
diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php
index 6802051..9e91f93 100644
--- a/data/templates/sidebar.block.linked.php
+++ b/data/templates/sidebar.block.linked.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 
 require_once('sidebar.linkedtags.inc.php');
 
diff --git a/data/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php
index 6ab5a95..ee82997 100644
--- a/data/templates/sidebar.block.menu.php
+++ b/data/templates/sidebar.block.menu.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 
 
 require_once('sidebar.linkedtags.inc.php');
diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php
index fbab636..5f06b40 100644
--- a/data/templates/sidebar.block.menu2.php
+++ b/data/templates/sidebar.block.menu2.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 
 require_once('sidebar.linkedtags.inc.php');
 
diff --git a/data/templates/sidebar.block.popular.php b/data/templates/sidebar.block.popular.php
index 3f5e8ca..50756c0 100644
--- a/data/templates/sidebar.block.popular.php
+++ b/data/templates/sidebar.block.popular.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 
 
 if(!isset($user)) {
diff --git a/data/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php
index 4831208..e34f820 100644
--- a/data/templates/sidebar.block.recent.php
+++ b/data/templates/sidebar.block.recent.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 
 /* Manage input */
 $userid = isset($userid)?$userid:NULL;
diff --git a/data/templates/sidebar.block.related.php b/data/templates/sidebar.block.related.php
index 559c648..60ee486 100644
--- a/data/templates/sidebar.block.related.php
+++ b/data/templates/sidebar.block.related.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 
 
 if(!isset($user)) $user="";
diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php
index ed79f28..64cb8ac 100644
--- a/data/templates/sidebar.block.search.php
+++ b/data/templates/sidebar.block.search.php
@@ -1,6 +1,6 @@
 <?php
 /* Service creation: only useful services are created */
-$searchhistoryservice =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
+$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 if ($logged_on_userid === false) {
diff --git a/data/templates/sidebar.linkedtags.inc.php b/data/templates/sidebar.linkedtags.inc.php
index f978339..020d0f0 100644
--- a/data/templates/sidebar.linkedtags.inc.php
+++ b/data/templates/sidebar.linkedtags.inc.php
@@ -9,8 +9,8 @@ function displayLinkedTags($tag, $linkType, $uId, $cat_url, $user, $editingMode
 	return array('output' => '', 'stoplist' => $stopList);
     }
 
-    $tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
-    $tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+    $tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
+    $tagstatservice =SemanticScuttle_Service_Factory::get('TagStat');
 
     // link '>'
     if($level>1) {