diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
index 5b560a9eed..19df4727c5 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
@@ -279,7 +279,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
                }
             }
             res.setDateHeader(HEADER_LAST_MODIFIED, modified.getTime());
-            res.setHeader(HEADER_CACHE_CONTROL, "must-revalidate");
+            res.setHeader(HEADER_CACHE_CONTROL, "must-revalidate max-age=0");
             res.setHeader(HEADER_ETAG, "\"" + Long.toString(modified.getTime()) + "\"");
          }
          
diff --git a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
index 1d95dc0978..5fa29c57e6 100644
--- a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
@@ -155,6 +155,13 @@ public class LinkPropertiesDialog extends BaseDialogBean
          NodeRef nodeRef = getEditableNode().getNodeRef();
          Map<String, Object> props = getEditableNode().getProperties();
          
+         //get the name and move the node as necessary
+         String name = (String) props.get(ContentModel.PROP_NAME);
+         if (name != null)
+         {
+            getFileFolderService().rename(nodeRef, name);
+         } 
+         
          Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef);
          
          // we need to put all the properties from the editable bag back into 
diff --git a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
index 54dfa1d426..830294f0f4 100644
--- a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
@@ -160,7 +160,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
                      if (checkExists(name + LINK_NODE_EXTENSION, destRef) == false)
                      {
                         Map<QName, Serializable> props = new HashMap<QName, Serializable>(2, 1.0f);
-                        props.put(ContentModel.PROP_NAME, name + LINK_NODE_EXTENSION);
+                        String newName = name + LINK_NODE_EXTENSION;
+                        props.put(ContentModel.PROP_NAME, newName);
                         props.put(ContentModel.PROP_LINK_DESTINATION, getNodeRef());
                         if (dd.isSubClass(getType(), ContentModel.TYPE_CONTENT))
                         {
@@ -168,7 +169,7 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
                            ChildAssociationRef childRef = nodeService.createNode(
                                  destRef,
                                  ContentModel.ASSOC_CONTAINS,
-                                 assocRef.getQName(),
+                                 QName.createQName(assocRef.getQName().getNamespaceURI(), newName),
                                  ApplicationModel.TYPE_FILELINK,
                                  props);