diff --git a/webservice/atompub/cmis/index.php b/webservice/atompub/cmis/index.php
index 3e00656..983f2d4 100644
--- a/webservice/atompub/cmis/index.php
+++ b/webservice/atompub/cmis/index.php
@@ -101,12 +101,12 @@ if ($workspace == 'servicedocument')
 */
 // TODO consider a registerServices function which will, dependant on what is requested, register the appropriate services, keep the logic out of the index file
 $APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection',
-                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'children'), 'rootchildren');
+                      array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'children'), 'root');
 $APP->registerService('dms', 'folder', 'KT_cmis_atom_service_folder', 'Root Folder Children Collection',
                       array(rawurlencode($APP->repositoryInfo['rootFolderId']), 'descendants'), 'rootdescendants');
 $APP->registerService('dms', 'checkedout', 'KT_cmis_atom_service_checkedout', 'Checked Out Document Collection', null, 
                       'checkedout', 'application/atom+xml;type=entry');
-$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'typeschildren');
+$APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'types');
 $APP->registerService('dms', 'types', 'KT_cmis_atom_service_types', 'Object Type Collection', null, 'typesdescendants');
 
 if ($workspace != 'servicedocument')
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
index 6bb0c29..9a01898 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
@@ -19,7 +19,8 @@ class KT_cmis_atom_responseFeed extends KT_atom_responseFeed {
         
         // append additional tags
 		$this->feed->appendChild($this->newAttr('xmlns:app', 'http://www.w3.org/2007/app'));
-		$this->feed->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200901'));
+		$this->feed->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200908'));
+		$this->feed->appendChild($this->newAttr('xmlns:cmisra', 'http://docs.oasis-open.org/ns/cmis/restatom/200908/'));
         
         // require the workspace for creating links within responses
         $queryArray = split('/', trim($_SERVER['QUERY_STRING'], '/'));
@@ -93,4 +94,4 @@ class KT_cmis_atom_ResponseFeed_PUT extends KT_cmis_atom_responseFeed{}
 class KT_cmis_atom_ResponseFeed_POST extends KT_cmis_atom_responseFeed{}
 class KT_cmis_atom_ResponseFeed_DELETE extends KT_cmis_atom_responseFeed{}
 
-?>
\ No newline at end of file
+?>
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
index 5378d88..e2254e5 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
@@ -83,7 +83,7 @@ class KT_cmis_atom_server extends KT_atom_server {
             $ws->appendChild($service->newAttr('cmis:repositoryRelationship', $this->repositoryInfo['repositoryRelationship']));
             
             // repository information
-            $element = $service->newElement('cmis:repositoryInfo');
+            $element = $service->newElement('cmisra:repositoryInfo');
             foreach($this->repositoryInfo as $key => $repoData)
             {
                 if ($key == 'rootFolderId') {
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
index c61c94b..423e5d7 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
@@ -71,7 +71,8 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
         $service = $this->newElement('service');
         $service->appendChild($this->newAttr('xmlns', 'http://www.w3.org/2007/app'));
         $service->appendChild($this->newAttr('xmlns:atom', 'http://www.w3.org/2005/Atom'));
-        $service->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200901'));
+        $service->appendChild($this->newAttr('xmlns:cmis', 'http://docs.oasis-open.org/ns/cmis/core/200908'));
+        $service->appendChild($this->newAttr('xmlns:cmisra', 'http://docs.oasis-open.org/ns/cmis/restatom/200908/'));
         $this->service =& $service;
         $this->DOM->appendChild($this->service);
     }
@@ -80,7 +81,7 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
     {
         $collection=$this->newElement('collection');
         $collection->appendChild($this->newAttr('href', $url));
-        $collection->appendChild($this->newAttr('cmis:collectionType', $cmisCollectionType));
+        $collection->appendChild($this->newAttr('cmisra:collectionType', $cmisCollectionType));
         $collection->appendChild($this->newElement('atom:title', $title));
         if (!is_null($accept)) {
             $collection->appendChild($this->newElement('accept', $accept));
@@ -123,4 +124,4 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
  */
 
 
-?>
\ No newline at end of file
+?>