diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index ed35ed7563..3d2a7daeb7 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -11,11 +11,11 @@ version.label=r2
 
 # Edition label
 
-version.edition=Community
+version.edition=Enterprise
 
 # Build number
 
-version.build=@build-number@
+version.build=r17008
 
 # Schema number
 
diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
index fa8e3b2b24..cd483659eb 100644
--- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java
+++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
@@ -319,7 +319,7 @@ public class CMISMapping implements InitializingBean
         }
 
         // Is it an Alfresco type id?
-        if (typeId.length() < 4 || typeId.charAt(1) != '/')
+        if (typeId.length() < 4 || typeId.charAt(1) != ':')
         {
             throw new AlfrescoRuntimeException("Malformed type id '" + typeId + "'");
         }
@@ -347,7 +347,7 @@ public class CMISMapping implements InitializingBean
         CMISTypeId typeId = mapAlfrescoQNameToTypeId.get(typeQName);
         if (typeId == null)
         {
-            String typeIdStr = scope.getLabel() + "/" + typeQName.toPrefixString(serviceRegistry.getNamespaceService());
+            String typeIdStr = scope.getLabel() + ":" + typeQName.toPrefixString(serviceRegistry.getNamespaceService());
             return new CMISTypeId(scope, typeQName, typeIdStr, typeQName);
         }
         else