diff --git a/common/src/app/common/path_names.cljc b/common/src/app/common/path_names.cljc
index 6fab97e66e..74774c0044 100644
--- a/common/src/app/common/path_names.cljc
+++ b/common/src/app/common/path_names.cljc
@@ -99,11 +99,11 @@ Some naming conventions:
 
 (defn butlast-path
   "Remove the last item of the path."
-  [path separator]
-  (let [split (split-path path :separator separator)]
+  [path]
+  (let [split (split-path path)]
     (if (= 1 (count split))
       ""
-      (join-path (butlast split) :separator separator))))
+      (join-path (butlast split)))))
 
 (defn butlast-path-with-dots
   "Remove the last item of the path."
diff --git a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
index f7d0a7f6a6..25fc451cf8 100644
--- a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
@@ -462,16 +462,16 @@
 ;; TOKEN UI OPS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn clean-paths
+(defn clean-tokens-paths
   []
-  (ptk/reify ::clean-paths
+  (ptk/reify ::clean-tokens-paths
     ptk/UpdateEvent
     (update [_ state]
       (assoc-in state [:workspace-tokens :unfolded-token-paths] []))))
 
-(defn toggle-path
+(defn toggle-token-path
   [path]
-  (ptk/reify ::toggle-path
+  (ptk/reify ::toggle-token-path
     ptk/UpdateEvent
     (update [_ state]
       (update-in state [:workspace-tokens :unfolded-token-paths]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 122e9fc186..a742e95afd 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -716,7 +716,7 @@
                              (remove str/empty?)
                              (remove nil?)
                              (distinct)
-                             (filter #(= (cpn/butlast-path % "/") (:path filters))))
+                             (filter #(= (cpn/butlast-path %) (:path filters))))
 
         groups              (when-not search?
                               (->> (sort (sequence xform components))
@@ -762,7 +762,7 @@
         on-go-back
         (mf/use-fn
          (mf/deps (:path filters))
-         #(swap! filters* assoc :path (cpn/butlast-path (:path filters) "/")))
+         #(swap! filters* assoc :path (cpn/butlast-path (:path filters))))
 
         on-enter-group
         (mf/use-fn #(swap! filters* assoc :path %))
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs b/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
index 241d73bd2c..8e5b763f9e 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
@@ -221,7 +221,7 @@
                                                {:name name
                                                 :value (:value valid-token)
                                                 :description description}))
-                          (dwtl/toggle-path path)
+                          (dwtl/toggle-token-path path)
                           (dwtp/propagate-workspace-tokens)
                           (modal/hide!))))))))))]
 
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/group.cljs b/frontend/src/app/main/ui/workspace/tokens/management/group.cljs
index 4261b1925a..b3450e8665 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/group.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/group.cljs
@@ -103,7 +103,7 @@
          (mf/deps type expandable?)
          (fn []
            (when expandable?
-             (st/emit! (dwtl/toggle-path (name type))))))
+             (st/emit! (dwtl/toggle-token-path (name type))))))
 
         on-popover-open-click
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/tokens/management/token_tree.cljs b/frontend/src/app/main/ui/workspace/tokens/management/token_tree.cljs
index 97ca77168e..6f4c8907c0 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/token_tree.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/token_tree.cljs
@@ -47,7 +47,7 @@
                               (mf/deps (:path node) type)
                               (fn []
                                 (let [path (str (name type)  "." (:path node))]
-                                  (st/emit! (dwtl/toggle-path path)))))]
+                                  (st/emit! (dwtl/toggle-token-path path)))))]
     [:li {:class (stl/css :folder-node)}
      [:> layer-button* {:label (:name node)
                         :expanded is-folder-expanded