diff --git a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
index 6f56e6c..150d193 100644
--- a/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
+++ b/webservice/atompub/cmis/KT_cmis_atom_server.services.inc.php
@@ -269,7 +269,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             foreach($response as $failed)
             {            
                 $entry = $feed->newEntry();
-                $objectElement = $feed->newElement('cmis:object');
+                $objectElement = $feed->newElement('cmisra:object');
                 $propertiesElement = $feed->newElement('cmis:properties');
                 $propElement = $feed->newElement('cmis:propertyId');
                 $propElement->appendChild($feed->newAttr('cmis:name', 'ObjectId'));
@@ -740,4 +740,4 @@ class KT_cmis_atom_service_type extends KT_cmis_atom_service {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
index 3746bfd..20d3155 100644
--- a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
+++ b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
@@ -298,13 +298,14 @@ class KT_cmis_atom_service_helper {
         $entry->appendChild($response->newField('updated', self::formatDatestamp()));
 
         // main CMIS entry
-        $objectElement = $response->newElement('cmis:object');
+        $objectElement = $response->newElement('cmisra:object');
         $propertiesElement = $response->newElement('cmis:properties');
 
         foreach($cmisEntry['properties'] as $propertyName => $property)
         {
             $propElement = $response->newElement('cmis:' . $property['type']);
-            $propElement->appendChild($response->newAttr('cmis:name', $propertyName));
+            $propElement->appendChild($response->newAttr('localName', 'rep-cmis:' . $propertyName));
+            $propElement->appendChild($response->newAttr('propertyDefinitionId', 'cmis:' . $propertyName));
             if (!empty($property['value']))
             {
                 if ($propertyName == 'ContentStreamUri') {
@@ -484,12 +485,12 @@ class KT_cmis_atom_service_helper {
     {
         $properties = array();
         
-        // find cmis:object tag
-        $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmis:object', $xmlArray, null, false);
+        // find cmisra:object tag
+        $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmisra:object', $xmlArray, null, false);
         if(count($baseCmisObject) <= 0)
         {
             $entryObject = KT_cmis_atom_service_helper::findTag('entry', $xmlArray, null, false);
-            $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmis:object', $entryObject['@children'], null, true);
+            $baseCmisObject = KT_cmis_atom_service_helper::findTag('cmisra:object', $entryObject['@children'], null, true);
         }
         
         if(count($baseCmisObject)>0)
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 83dfec9..5378d88 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
@@ -151,9 +151,12 @@ class KT_cmis_atom_server extends KT_atom_server {
     {
 		ob_end_clean();
         if (!$this->headersSet) header('Content-type: text/xml');
+
+        //include('/var/www/atompub_response.xml');
+
 		if ($this->renderBody) echo $this->output;
 	}
 
 }
 
-?>
\ No newline at end of file
+?>