diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java
index 15c97d6..5c838b0 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/WorkspaceUtils.java
@@ -231,14 +231,12 @@ public class WorkspaceUtils {
 		if(originalItem.isFolder()){
 			copiedFolder = userCatalogue.addWorkspaceItem(folderOrFileId, userCatalogue.getId()); // add to .catalogue root area
 			copiedFolder.setDescription(bean.getDescription());
+			((WorkspaceFolder)copiedFolder).rename(UtilMethods.fromProductTitleToName(bean.getTitle()) + "_" + referenceTime);
 		}
 		else{
 			copiedFolder = userCatalogue.createFolder(UtilMethods.fromProductTitleToName(bean.getTitle()) + "_" + referenceTime, bean.getDescription());
 		}
 
-		// change name of the copied folder to match the title (append the timestamp to avoid ties)
-		((WorkspaceFolder)copiedFolder).rename(UtilMethods.fromProductTitleToName(bean.getTitle()) + "_" + referenceTime);
-
 		// retrieve the children
 		List<ResourceElementBean> resourcesToAdd = rootResource.getChildren();
 
@@ -257,7 +255,7 @@ public class WorkspaceUtils {
 
 				resources.add(new ResourceBean(
 						copiedFile.getPublicLink(true), 
-						resource.getName(), 
+						resource.getEditableName(), 
 						copiedFile.getDescription(), 
 						copiedFile.getId(),
 						userName, 
@@ -265,7 +263,7 @@ public class WorkspaceUtils {
 						((FolderItem)copiedFile).getMimeType()));
 
 				// postpone rename operation
-				copiedFile.rename(resource.getName() + "_" + referenceTime);
+				copiedFile.rename(resource.getEditableName());
 			}
 
 		}