diff --git a/config/alfresco/messages/lock-service.properties b/config/alfresco/messages/lock-service.properties
index 013dd290dd..8db9ddd99c 100644
--- a/config/alfresco/messages/lock-service.properties
+++ b/config/alfresco/messages/lock-service.properties
@@ -2,5 +2,5 @@
 
 lock_service.insufficent_privileges=You have insufficent privileges to release the lock on the node (id: {0}).  The node is locked by another user.
 lock_service.node_locked=The node (id: {0}) could not be locked since it is already locked by another user.
-lock_service.no_op=Can not perform operation since the node (id:{0}) is locked by another user.
-lock_service.no_op2=Can not perform operation {0} since the node (id:{1}) is locked by another user.
+lock_service.no_op=Can not perform operation since the node (id:{0}) is locked.
+lock_service.no_op2=Can not perform operation {0} since the node (id:{1}) is locked.
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index a717802b40..6494d26f4a 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -518,8 +518,14 @@ public class FileFolderServiceImpl implements FileFolderService
                     qname,
                     true);
         }
-        // changed the name property
-        nodeService.setProperty(targetNodeRef, ContentModel.PROP_NAME, newName);
+       
+        // Only update the name if it has changed
+        String currentName = (String)nodeService.getProperty(targetNodeRef, ContentModel.PROP_NAME);
+        if (currentName.equals(newName) == false)
+        {
+            // changed the name property
+            nodeService.setProperty(targetNodeRef, ContentModel.PROP_NAME, newName);
+        }
         
         // get the details after the operation
         FileInfo afterFileInfo = toFileInfo(targetNodeRef);