diff --git a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
index 46905483d0..d19b514c3f 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
@@ -167,7 +167,11 @@ public class DMObjectServicePort extends DMAbstractServicePort implements Object
         {
             NodeRef folderNodeRef = cmisService.getFolder(folderId);
             NodeRef sourceNodeRef = cmisService.getReadableObject(sourceId, NodeRef.class);
-            String name = propertiesUtil.getProperty(sourceNodeRef, CMISDictionaryModel.PROP_NAME, null);
+            String name = propertiesUtil.getCmisPropertyValue(properties, CMISDictionaryModel.PROP_NAME, null);
+            if (name == null)
+            {
+                name = propertiesUtil.getProperty(sourceNodeRef, CMISDictionaryModel.PROP_NAME, null);
+            }
             NodeRef newDocumentNodeRef;
             try
             {
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
index 63301c79d2..cf63a7d17d 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
@@ -70,9 +70,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
     private static final Map<CMISAclSupportedPermissionEnum, EnumSupportedPermissions> ACL_SUPPORTED_PERMISSION_ENUM_MAPPING;
     private static final Map<CMISAclPropagationEnum, EnumACLPropagation> ACL_PROPAGATION_ENUM_MAPPGIN;
 
-    // FIXME: Hard-coded! should be retrieved using standard mechanism
-    private String repositoryUri = "http://localhost:8080/alfresco/cmis";
-
     static
     {
         JOIN_ENUM_MAPPING = new HashMap<CMISJoinEnum, EnumCapabilityJoin>();
@@ -480,8 +477,7 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
         repositoryInfoType.setRootFolderId(propertiesUtil.getProperty(cmisService.getDefaultRootNodeRef(), CMISDictionaryModel.PROP_OBJECT_ID, (String) null));
         repositoryInfoType.setLatestChangeLogToken(cmisChangeLogService.getLastChangeLogToken());
         // TODO: cmisVersionSupported is different in stubs and specification
-        repositoryInfoType.setCmisVersionSupported("1.0 cd06");
-        repositoryInfoType.setThinClientURI(repositoryUri);
+        repositoryInfoType.setCmisVersionSupported("1.0");
         repositoryInfoType.setChangesIncomplete(cmisChangeLogService.getChangesIncomplete());
         // TODO: getFolderTree capability
         List<CMISBaseObjectTypeIds> changesOnTypeCapability = cmisChangeLogService.getChangesOnTypeCapability();