diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
index 5d0446a04..7ce343ebc 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@@ -100,8 +100,8 @@
         on-drag-start
         (mf/use-callback
          (fn [component event]
-           (dnd/set-data! event "app/component" {:file-id file-id
-                                                 :component component})
+           (dnd/set-data! event "penpot/component" {:file-id file-id
+                                                    :component component})
            (dnd/set-allowed-effect! event "move")))]
 
     [:div.asset-group
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index fc1630396..b683b10bf 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -181,7 +181,7 @@
             (st/emit! (dwc/toggle-collapse (:id item)))))
 
         [dprops dref] (hooks/use-sortable
-                       :data-type "app/layer"
+                       :data-type "penpot/layer"
                        :on-drop on-drop
                        :on-drag on-drag
                        :on-hold on-hold
diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
index 5b2d8eb52..aa19ef8f1 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs
@@ -99,7 +99,7 @@
 
         [dprops dref]
         (hooks/use-sortable
-         :data-type "app/page"
+         :data-type "penpot/page"
          :on-drop on-drop
          :data {:id id
                 :index index
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index eeaaa55d1..fb27888ce 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -578,8 +578,8 @@
         on-drag-enter
         (mf/use-callback
          (fn [e]
-           (when (or (dnd/has-type? e "app/shape")
-                     (dnd/has-type? e "app/component")
+           (when (or (dnd/has-type? e "penpot/shape")
+                     (dnd/has-type? e "penpot/component")
                      (dnd/has-type? e "Files")
                      (dnd/has-type? e "text/uri-list")
                      (dnd/has-type? e "text/asset-id"))
@@ -588,8 +588,8 @@
         on-drag-over
         (mf/use-callback
          (fn [e]
-           (when (or (dnd/has-type? e "app/shape")
-                     (dnd/has-type? e "app/component")
+           (when (or (dnd/has-type? e "penpot/shape")
+                     (dnd/has-type? e "penpot/component")
                      (dnd/has-type? e "Files")
                      (dnd/has-type? e "text/uri-list")
                      (dnd/has-type? e "text/asset-id"))
@@ -610,8 +610,8 @@
                  asset-name   (dnd/get-data event "text/asset-name")
                  asset-type   (dnd/get-data event "text/asset-type")]
              (cond
-               (dnd/has-type? event "app/shape")
-               (let [shape (dnd/get-data event "app/shape")
+               (dnd/has-type? event "penpot/shape")
+               (let [shape (dnd/get-data event "penpot/shape")
                      final-x (- (:x viewport-coord) (/ (:width shape) 2))
                      final-y (- (:y viewport-coord) (/ (:height shape) 2))]
                  (st/emit! (dw/add-shape (-> shape
@@ -619,8 +619,8 @@
                                              (assoc :x final-x)
                                              (assoc :y final-y)))))
 
-               (dnd/has-type? event "app/component")
-               (let [{:keys [component file-id]} (dnd/get-data event "app/component")
+               (dnd/has-type? event "penpot/component")
+               (let [{:keys [component file-id]} (dnd/get-data event "penpot/component")
                      shape (get-in component [:objects (:id component)])
                      final-x (- (:x viewport-coord) (/ (:width shape) 2))
                      final-y (- (:y viewport-coord) (/ (:height shape) 2))]
diff --git a/frontend/src/app/util/dom/dnd.cljs b/frontend/src/app/util/dom/dnd.cljs
index 73143ba35..8887417e9 100644
--- a/frontend/src/app/util/dom/dnd.cljs
+++ b/frontend/src/app/util/dom/dnd.cljs
@@ -55,11 +55,11 @@
 
 (defn set-data!
   ([e data]
-   (set-data! e "app/data" data))
+   (set-data! e "penpot/data" data))
   ([e data-type data]
    (let [dt (.-dataTransfer e)]
      (if (or (str/starts-with? data-type "application")
-             (str/starts-with? data-type "app"))
+             (str/starts-with? data-type "penpot"))
        (.setData dt data-type (t/encode data))
        (.setData dt data-type data))
      e)))
@@ -100,10 +100,10 @@
 
 (defn get-data
   ([e]
-   (get-data e "app/data"))
+   (get-data e "penpot/data"))
   ([e data-type]
    (let [dt (.-dataTransfer e)]
-     (if (or (str/starts-with? data-type "app")
+     (if (or (str/starts-with? data-type "penpot")
              (= data-type "application/json"))
        (t/decode (.getData dt data-type))
        (.getData dt data-type)))))