diff --git a/src/uxbox/data/workspace.cljs b/src/uxbox/data/workspace.cljs
index cd6d5cf78..0f69ff5ab 100644
--- a/src/uxbox/data/workspace.cljs
+++ b/src/uxbox/data/workspace.cljs
@@ -335,7 +335,7 @@
           (rx/from-coll
            (map unlock-shape (:items shape))))))))
 
-(defn transfer-shape
+(defn drop-shape
   "Event used in drag and drop for transfer shape
   from one position to an other."
   [sid tid type]
diff --git a/src/uxbox/ui/workspace/toolboxes/layers.cljs b/src/uxbox/ui/workspace/toolboxes/layers.cljs
index 6072170cd..7dfd74e99 100644
--- a/src/uxbox/ui/workspace/toolboxes/layers.cljs
+++ b/src/uxbox/ui/workspace/toolboxes/layers.cljs
@@ -133,8 +133,8 @@
               (let [id (dnd/get-data event)
                     over (:over @local)]
                 (case (:over @local)
-                  :top (rs/emit! (dw/transfer-shape id (:id item) :before))
-                  :bottom (rs/emit! (dw/transfer-shape id (:id item) :after)))
+                  :top (rs/emit! (dw/drop-shape id (:id item) :before))
+                  :bottom (rs/emit! (dw/drop-shape id (:id item) :after)))
                 (swap! local assoc :dragging false :over nil)))
             (on-drag-over [event]
               (dom/prevent-default event)
@@ -210,9 +210,9 @@
               (let [id (dnd/get-data event)
                     over (:over @local)]
                 (case (:over @local)
-                  :top (rs/emit! (dw/transfer-shape id (:id item) :before))
-                  :bottom (rs/emit! (dw/transfer-shape id (:id item) :after))
-                  :middle (rs/emit! (dw/transfer-shape id (:id item) :inside)))
+                  :top (rs/emit! (dw/drop-shape id (:id item) :before))
+                  :bottom (rs/emit! (dw/drop-shape id (:id item) :after))
+                  :middle (rs/emit! (dw/drop-shape id (:id item) :inside)))
                 (swap! local assoc :dragging false :over nil)))
             (on-drag-over [event]
               (dom/prevent-default event)
diff --git a/test/uxbox/data/workspace_tests.cljs b/test/uxbox/data/workspace_tests.cljs
index 4a0ca7c59..8029a4590 100644
--- a/test/uxbox/data/workspace_tests.cljs
+++ b/test/uxbox/data/workspace_tests.cljs
@@ -4,14 +4,14 @@
             [uxbox.rstore :as rs]
             [uxbox.data.workspace :as dw]))
 
-(t/deftest transfer-shape-test
+(t/deftest drop-shape-test
   (t/testing "case 1: move shape before other shape"
     (let [initial {:pages-by-id {1 {:id 1 :shapes [1 2 3]}}
                    :shapes-by-id {1 {:id 1 :page 1}
                                   2 {:id 2 :page 1}
                                   3 {:id 3 :page 1}}}
           expected (assoc-in initial [:pages-by-id 1 :shapes] [3 1 2])
-          event (dw/transfer-shape 3 1 :before)
+          event (dw/drop-shape 3 1 :before)
           result (rs/-apply-update event initial)]
       ;; (pprint expected)
       ;; (pprint result)
@@ -24,7 +24,7 @@
                                   2 {:id 2 :page 1}
                                   3 {:id 3 :page 1}}}
           expected (assoc-in initial [:pages-by-id 1 :shapes] [1 3 2])
-          event (dw/transfer-shape 3 1 :after)
+          event (dw/drop-shape 3 1 :after)
           result (rs/-apply-update event initial)]
       (t/is (= result expected))
       (t/is (vector? (get-in result [:pages-by-id 1 :shapes])))))
@@ -37,7 +37,7 @@
                                   2 {:id 2 :page 1 :group 1}
                                   3 {:id 3 :page 1}
                                   4 {:id 4 :page 1}}}
-          event (dw/transfer-shape 3 2 :before)
+          event (dw/drop-shape 3 2 :before)
           expected (-> initial
                        (assoc-in [:pages-by-id 1 :shapes] [1 4])
                        (assoc-in [:shapes-by-id 1 :items] [3 2])
@@ -54,7 +54,7 @@
                                   2 {:id 2 :page 1 :group 1}
                                   3 {:id 3 :page 1}
                                   4 {:id 4 :page 1}}}
-          event (dw/transfer-shape 3 1 :inside)
+          event (dw/drop-shape 3 1 :inside)
           expected (-> initial
                        (assoc-in [:pages-by-id 1 :shapes] [1 4])
                        (assoc-in [:shapes-by-id 1 :items] [2 3])
@@ -73,7 +73,7 @@
                                   2 {:id 2 :page 1 :group 1}
                                   3 {:id 3 :page 1 :group 1}
                                   4 {:id 4 :page 1}}}
-          event (dw/transfer-shape 3 4 :after)
+          event (dw/drop-shape 3 4 :after)
           expected (-> initial
                        (assoc-in [:pages-by-id 1 :shapes] [1 4 3])
                        (assoc-in [:shapes-by-id 1 :items] [2])
@@ -92,7 +92,7 @@
                                      :items [4]}
                                   3 {:id 3 :page 1 :group 1}
                                   4 {:id 4 :page 1 :group 2}}}
-          event (dw/transfer-shape 2 3 :after)
+          event (dw/drop-shape 2 3 :after)
           expected (-> initial
                        (assoc-in [:pages-by-id 1 :shapes] [1])
                        (assoc-in [:shapes-by-id 1 :items] [3 2])
@@ -115,7 +115,7 @@
                                      :items [4]}
                                   3 {:id 3 :page 1}
                                   4 {:id 4 :page 1 :group 2}}}
-          event (dw/transfer-shape 2 1 :after)
+          event (dw/drop-shape 2 1 :after)
           expected (-> initial
                        (assoc-in [:pages-by-id 1 :shapes] [2 3])
                        (update-in [:shapes-by-id] dissoc 1)