diff --git a/frontend/src/uxbox/main/data/dashboard.cljs b/frontend/src/uxbox/main/data/dashboard.cljs
index b8f5b6164..822a061ea 100644
--- a/frontend/src/uxbox/main/data/dashboard.cljs
+++ b/frontend/src/uxbox/main/data/dashboard.cljs
@@ -246,7 +246,7 @@
   (ptk/reify ::create-project
     ptk/WatchEvent
     (watch [_ state stream]
-      (let [name (str "New Project " (gensym ""))
+      (let [name (name (gensym "New Project "))
             team-id (get-in state [:dashboard-local :team-id])]
         (->> (rp/mutation! :create-project {:name name :team-id team-id})
              (rx/map project-created))))))
@@ -348,7 +348,7 @@
   (ptk/reify ::create-file
     ptk/WatchEvent
     (watch [_ state stream]
-      (let [name (str "New File " (gensym ""))
+      (let [name (name (gensym "New File "))
             params {:name name :project-id project-id}]
         (->> (rp/mutation! :create-file params)
              (rx/map file-created))))))
diff --git a/frontend/src/uxbox/main/data/icons.cljs b/frontend/src/uxbox/main/data/icons.cljs
index dabb381cb..e35234f89 100644
--- a/frontend/src/uxbox/main/data/icons.cljs
+++ b/frontend/src/uxbox/main/data/icons.cljs
@@ -83,7 +83,7 @@
                  :content content
                  :id (uuid/next)
                  ;; TODO Keep the name of the original icon
-                 :name (str "Icon " (gensym "i"))
+                 :name (name (gensym "Icon "))
                  :metadata metadata})]
         (->> (rx/from files)
              (rx/filter allowed?)
diff --git a/frontend/src/uxbox/main/data/workspace/persistence.cljs b/frontend/src/uxbox/main/data/workspace/persistence.cljs
index 3bd38431a..629f57d2e 100644
--- a/frontend/src/uxbox/main/data/workspace/persistence.cljs
+++ b/frontend/src/uxbox/main/data/workspace/persistence.cljs
@@ -221,7 +221,7 @@
     ptk/WatchEvent
     (watch [this state stream]
       (let [file-id (get-in state [:workspace-file :id])
-            name (str "Page " (gensym "p"))
+            name (name (gensym "Page "))
             ordering (count (get-in state [:workspace-file :pages]))
             params {:name name
                     :file-id file-id