diff --git a/scripts/build-worker.clj b/scripts/build-worker.clj
index eb3dcf5fe..ca3823c57 100644
--- a/scripts/build-worker.clj
+++ b/scripts/build-worker.clj
@@ -5,7 +5,7 @@
 (let [start (System/nanoTime)]
   (b/build
    (b/inputs "src" "vendor")
-   {:main 'uxbox.worker
+   {:main 'uxbox-worker.main
     :output-to "resources/public/js/worker.js"
     :output-dir "resources/public/js/worker"
     :asset-path "js"
diff --git a/scripts/figwheel.clj b/scripts/figwheel.clj
index 22933bf9c..b41c0ff27 100644
--- a/scripts/figwheel.clj
+++ b/scripts/figwheel.clj
@@ -26,7 +26,6 @@
       :output-to "resources/public/js/main.js"
       :output-dir "resources/public/js"
       :verbose true}}
-
     #_{:id "preview"
      ;; :figwheel {:on-jsload "uxbox.ui/init"}
      :source-paths ["src" "vendor"]
diff --git a/scripts/watch-worker.clj b/scripts/watch-worker.clj
index 20758254f..d8f488dd1 100644
--- a/scripts/watch-worker.clj
+++ b/scripts/watch-worker.clj
@@ -2,7 +2,7 @@
 
 (b/watch
  (b/inputs "src" "vendor")
- {:main 'uxbox.worker
+ {:main 'uxbox-worker.main
   :output-to "resources/public/js/worker.js"
   :output-dir "resources/public/js/worker"
   :asset-path "js"
diff --git a/src/uxbox/worker/align.cljs b/src/uxbox_worker/align.cljs
similarity index 78%
rename from src/uxbox/worker/align.cljs
rename to src/uxbox_worker/align.cljs
index 2f08cac77..cc2a58e3c 100644
--- a/src/uxbox/worker/align.cljs
+++ b/src/uxbox_worker/align.cljs
@@ -4,26 +4,26 @@
 ;;
 ;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
 
-(ns uxbox.worker.align
+(ns uxbox-worker.align
   "Workspace aligment indexes worker."
   (:require [beicon.core :as rx]
             [kdtree.core :as kd]
-            [uxbox.worker.core :as wrk]
+            [uxbox-worker.impl :as impl]
             [uxbox.util.geom.point :as gpt]))
 
 (defonce tree (kd/create))
 
-(defmethod wrk/handler :grid/init
+(defmethod impl/handler :grid/init
   [{:keys [sender width height x-axis y-axis] :as opts}]
   (time
    (let [value (kd/generate width height (or x-axis 10) (or y-axis 10))]
      (set! tree value)))
-  (wrk/reply! sender nil))
+  (impl/reply! sender nil))
 
-(defmethod wrk/handler :grid/align
+(defmethod impl/handler :grid/align
   [{:keys [sender point] :as message}]
   (let [point #js [(:x point) (:y point)]
         results (js->clj (kd/nearest tree point 1))
         [[x y] d] (first results)
         result (gpt/point x y)]
-    (wrk/reply! sender {:point (gpt/point x y)})))
+    (impl/reply! sender {:point (gpt/point x y)})))
diff --git a/src/uxbox/worker/core.cljs b/src/uxbox_worker/impl.cljs
similarity index 96%
rename from src/uxbox/worker/core.cljs
rename to src/uxbox_worker/impl.cljs
index d5f30b790..e66bd6f01 100644
--- a/src/uxbox/worker/core.cljs
+++ b/src/uxbox_worker/impl.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
 
-(ns uxbox.worker.core
+(ns uxbox-worker.impl
   (:require [uxbox.util.transit :as t]))
 
 (enable-console-print!)
diff --git a/src/uxbox/worker.cljs b/src/uxbox_worker/main.cljs
similarity index 79%
rename from src/uxbox/worker.cljs
rename to src/uxbox_worker/main.cljs
index 4db0d390f..b1044e8e3 100644
--- a/src/uxbox/worker.cljs
+++ b/src/uxbox_worker/main.cljs
@@ -4,18 +4,18 @@
 ;;
 ;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
 
-(ns uxbox.worker
+(ns uxbox-worker.main
   (:require [beicon.core :as rx]
             [uxbox.util.transit :as t]
-            [uxbox.worker.core :as wrk]
-            [uxbox.worker.align]))
+            [uxbox-worker.impl :as impl]
+            [uxbox-worker.align]))
 
 (enable-console-print!)
 
 (defn- on-message
   [event]
   (let [message (t/decode (.-data event))]
-    (wrk/handler message)))
+    (impl/handler message)))
 
 (defonce _
   (.addEventListener js/self "message" on-message))