diff --git a/lisp/fg42/build/docs.el b/lisp/fg42/build/docs.el
index fb42a40..56258c9 100644
--- a/lisp/fg42/build/docs.el
+++ b/lisp/fg42/build/docs.el
@@ -33,7 +33,7 @@
 
 (require 'ox-html)
 
-(require 'cubes/all)
+(require 'fg42/cubes/all)
 (require 'fg42/build/core)
 (require 'fg42/build/utils)
 (require 'fg42/build/ox-template)
@@ -45,7 +45,7 @@
 
 (defun fg42/build-docs-for-cube (build-dir cube)
   "Build the given CUBE's doc in BUILD-DIR."
-  (let* ((cubes-dir (expand-file-name "site/cubes/" build-dir))
+  (let* ((cubes-dir (expand-file-name "site/fg42/cubes/" build-dir))
          (props (symbol-plist cube))
          (docs  (plist-get props :docs))
          (cube-file (concat (expand-file-name (symbol-name cube) cubes-dir)
@@ -76,12 +76,12 @@
   ;; Build the cubes list index file
   (message "Processing cubes index file")
   (copy-template cubes-index-template
-                 (expand-file-name "site/cubes/index.org" build-dir)
+                 (expand-file-name "site/fg42/cubes/index.org" build-dir)
                  (list
                   (cons :links (mapconcat (lambda (c)
                                             (format "- [[%s][%s]]\n"
                                                     ;; href
-                                                    (format "%s/cubes/%s.html"  host c)
+                                                    (format "%s/fg42/cubes/%s.html"  host c)
                                                     ;; title
                                                     (plist-get (symbol-plist c) :title)))
                                           (sort fg42/available-cubes 'string<))))))
diff --git a/lisp/fg42/cubes/agda.el b/lisp/fg42/cubes/agda.el
index 0fa6848..6725aa5 100644
--- a/lisp/fg42/cubes/agda.el
+++ b/lisp/fg42/cubes/agda.el
@@ -38,5 +38,5 @@
      (shell-command-to-string (concat cabal-bin "agda-mode locate")))))
 
 
-(provide 'cubes/agda)
+(provide 'fg42/cubes/agda)
 ;;; agda.el ends here
diff --git a/lisp/fg42/cubes/all.el b/lisp/fg42/cubes/all.el
index ee5f8d0..974b34c 100644
--- a/lisp/fg42/cubes/all.el
+++ b/lisp/fg42/cubes/all.el
@@ -23,23 +23,23 @@
 ;;; Code:
 
 (require 'fg42/flags)
-(require 'cubes/editor)
-(require 'cubes/elisp)
-(require 'cubes/region-expansion)
-(require 'cubes/wm)
-(require 'cubes/modeline)
-(require 'cubes/autocompletion)
-(require 'cubes/golang)
-(require 'cubes/project)
-(require 'cubes/irc)
-(require 'cubes/terminal)
-(require 'cubes/java)
-(require 'cubes/python)
-(require 'cubes/snippets)
-(require 'cubes/org)
-(require 'cubes/git)
-(require 'cubes/bookmark)
-(require 'cubes/terraform)
+(require 'fg42/cubes/editor)
+(require 'fg42/cubes/elisp)
+(require 'fg42/cubes/region-expansion)
+(require 'fg42/cubes/wm)
+(require 'fg42/cubes/modeline)
+(require 'fg42/cubes/autocompletion)
+(require 'fg42/cubes/golang)
+(require 'fg42/cubes/project)
+(require 'fg42/cubes/irc)
+(require 'fg42/cubes/terminal)
+(require 'fg42/cubes/java)
+(require 'fg42/cubes/python)
+(require 'fg42/cubes/snippets)
+(require 'fg42/cubes/org)
+(require 'fg42/cubes/git)
+(require 'fg42/cubes/bookmark)
+(require 'fg42/cubes/terraform)
 
-(provide 'cubes/all)
+(provide 'fg42/cubes/all)
 ;;; all.el ends here
diff --git a/lisp/fg42/cubes/autocompletion.el b/lisp/fg42/cubes/autocompletion.el
index 98159aa..816511d 100644
--- a/lisp/fg42/cubes/autocompletion.el
+++ b/lisp/fg42/cubes/autocompletion.el
@@ -95,5 +95,5 @@
     (add-hook 'company-mode-hook 'company-box-mode)))
 
 
-(provide 'cubes/autocompletion)
+(provide 'fg42/cubes/autocompletion)
 ;;; autocompletion.el ends here
diff --git a/lisp/fg42/cubes/bookmark.el b/lisp/fg42/cubes/bookmark.el
index 327d75c..0dfd72f 100644
--- a/lisp/fg42/cubes/bookmark.el
+++ b/lisp/fg42/cubes/bookmark.el
@@ -31,7 +31,7 @@
 
 (defcube fg42/bookmark-cube
   "bookmark cube"
-  :title "cubes/fg42/bookmark-cube.org"
+  :title "fg42/cubes/fg42/bookmark-cube.org"
   :flag bookmark
   :flag-default t
 
@@ -96,5 +96,5 @@
                (,bprev . bm-previous)
                (,btoggle . bm-toggle))))))
 
-(provide 'cubes/bookmark)
+(provide 'fg42/cubes/bookmark)
 ;;; bookmark.el ends here
diff --git a/lisp/fg42/cubes/clojure.el b/lisp/fg42/cubes/clojure.el
index 4bc4f66..232f657 100644
--- a/lisp/fg42/cubes/clojure.el
+++ b/lisp/fg42/cubes/clojure.el
@@ -47,5 +47,5 @@ Also activates LSP and converts `fn` to λ."
     :config (when-flag clojure
               (setq lsp-enable-indentation nil))))
 
-(provide 'cubes/clojure)
+(provide 'fg42/cubes/clojure)
 ;;; clojure.el ends here
diff --git a/lisp/fg42/cubes/clojure/core.el b/lisp/fg42/cubes/clojure/core.el
index 2dc4163..54fe8d2 100644
--- a/lisp/fg42/cubes/clojure/core.el
+++ b/lisp/fg42/cubes/clojure/core.el
@@ -45,5 +45,5 @@
                                           company-keywords))))))
 
 
-(provide 'cubes/clojure/core)
+(provide 'fg42/cubes/clojure/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/cpp.el b/lisp/fg42/cubes/cpp.el
index 31553c3..167a816 100644
--- a/lisp/fg42/cubes/cpp.el
+++ b/lisp/fg42/cubes/cpp.el
@@ -66,5 +66,5 @@ https://github.com/ninja-build/ninja/blob/master/misc/ninja-mode.el"
                                    '((company-capf
                                       company-keywords))))))
 
-(provide 'cubes/cpp)
+(provide 'fg42/cubes/cpp)
 ;;; cpp.el ends here
diff --git a/lisp/fg42/cubes/editor.el b/lisp/fg42/cubes/editor.el
index ee6030c..f43a3fd 100644
--- a/lisp/fg42/cubes/editor.el
+++ b/lisp/fg42/cubes/editor.el
@@ -26,7 +26,7 @@
 (require 'fg42/cube)
 (require 'fg42/utils)
 (require 'fg42/modeline)
-(require 'cubes/modeline)
+(require 'fg42/cubes/modeline)
 (require 'fg42/themes)
 (require 'fg42/project)
 
@@ -373,5 +373,5 @@ https://emacsthemes.com/themes/badwolf-theme.html"
     ))
 
 
-(provide 'cubes/editor)
+(provide 'fg42/cubes/editor)
 ;;; editor.el ends here
diff --git a/lisp/fg42/cubes/eldoc.el b/lisp/fg42/cubes/eldoc.el
index 8b00cec..334df28 100644
--- a/lisp/fg42/cubes/eldoc.el
+++ b/lisp/fg42/cubes/eldoc.el
@@ -41,5 +41,5 @@ a box."
     (add-hook 'eldoc-mode-hook 'eldoc-box-hover-at-point-mode)))
 
 
-(provide 'cubes/eldoc)
+(provide 'fg42/cubes/eldoc)
 ;;; eldoc.el ends here
diff --git a/lisp/fg42/cubes/elisp.el b/lisp/fg42/cubes/elisp.el
index 17ed787..add4a16 100644
--- a/lisp/fg42/cubes/elisp.el
+++ b/lisp/fg42/cubes/elisp.el
@@ -28,7 +28,7 @@
 
 (defcube fg42/elisp-cube
   "Elisp cube"
-  :title "cubes/fg42/elisp-cube.org"
+  :title "fg42/cubes/fg42/elisp-cube.org"
   :no-flag t
 
   (fg42/rainbow-delimiters-cube)
@@ -41,5 +41,5 @@
   (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))
 
 
-(provide 'cubes/elisp)
+(provide 'fg42/cubes/elisp)
 ;;; elisp.el ends here
diff --git a/lisp/fg42/cubes/elisp/core.el b/lisp/fg42/cubes/elisp/core.el
index cca5201..f77c108 100644
--- a/lisp/fg42/cubes/elisp/core.el
+++ b/lisp/fg42/cubes/elisp/core.el
@@ -36,5 +36,5 @@
   (message "Elisp cube is done"))
 
 
-(provide 'cubes/elisp/core)
+(provide 'fg42/cubes/elisp/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/fg42.el b/lisp/fg42/cubes/fg42.el
index d7a2b2d..824948a 100644
--- a/lisp/fg42/cubes/fg42.el
+++ b/lisp/fg42/cubes/fg42.el
@@ -24,39 +24,39 @@
 (require 'fg42/cube)
 (require 'fg42/utils)
 
-(require 'cubes/editor)
-(require 'cubes/org)
-(require 'cubes/elisp)
-(require 'cubes/region-expansion)
-(require 'cubes/wm)
-(require 'cubes/modeline)
-(require 'cubes/autocompletion)
-(require 'cubes/golang)
-(require 'cubes/project)
-(require 'cubes/irc)
-(require 'cubes/terminal)
-(require 'cubes/java)
-(require 'cubes/python)
-(require 'cubes/cpp)
-(require 'cubes/snippets)
-(require 'cubes/rust)
-(require 'cubes/mastodon)
-(require 'cubes/git)
-(require 'cubes/bookmark)
-(require 'cubes/terraform)
-(require 'cubes/graph)
-(require 'cubes/clojure)
-(require 'cubes/scheme)
-(require 'cubes/meson)
-(require 'cubes/godot3d)
-(require 'cubes/meissa)
-(require 'cubes/proof)
-(require 'cubes/agda)
-(require 'cubes/notifications)
-(require 'cubes/noether)
-(require 'cubes/nix)
-(require 'cubes/julia)
-(require 'cubes/themes)
+(require 'fg42/cubes/editor)
+(require 'fg42/cubes/org)
+(require 'fg42/cubes/elisp)
+(require 'fg42/cubes/region-expansion)
+(require 'fg42/cubes/wm)
+(require 'fg42/cubes/modeline)
+(require 'fg42/cubes/autocompletion)
+(require 'fg42/cubes/golang)
+(require 'fg42/cubes/project)
+(require 'fg42/cubes/irc)
+(require 'fg42/cubes/terminal)
+(require 'fg42/cubes/java)
+(require 'fg42/cubes/python)
+(require 'fg42/cubes/cpp)
+(require 'fg42/cubes/snippets)
+(require 'fg42/cubes/rust)
+(require 'fg42/cubes/mastodon)
+(require 'fg42/cubes/git)
+(require 'fg42/cubes/bookmark)
+(require 'fg42/cubes/terraform)
+(require 'fg42/cubes/graph)
+(require 'fg42/cubes/clojure)
+(require 'fg42/cubes/scheme)
+(require 'fg42/cubes/meson)
+(require 'fg42/cubes/godot3d)
+(require 'fg42/cubes/meissa)
+(require 'fg42/cubes/proof)
+(require 'fg42/cubes/agda)
+(require 'fg42/cubes/notifications)
+(require 'fg42/cubes/noether)
+(require 'fg42/cubes/nix)
+(require 'fg42/cubes/julia)
+(require 'fg42/cubes/themes)
 
 
 (defcube fg42/editor
@@ -79,5 +79,5 @@ via flags."
 
 
 
-(provide 'cubes/fg42)
+(provide 'fg42/cubes/fg42)
 ;;; fg42.el ends here
diff --git a/lisp/fg42/cubes/git.el b/lisp/fg42/cubes/git.el
index 0de3837..5df33c9 100644
--- a/lisp/fg42/cubes/git.el
+++ b/lisp/fg42/cubes/git.el
@@ -65,5 +65,5 @@ For more info check out [[https://github.com/dgutov/diff-hl][diff-hl]] 's page."
   (fg42/diff-hl-cube))
 
 
-(provide 'cubes/git)
+(provide 'fg42/cubes/git)
 ;;; git.el ends here
diff --git a/lisp/fg42/cubes/godot3d.el b/lisp/fg42/cubes/godot3d.el
index 057d289..acf949d 100644
--- a/lisp/fg42/cubes/godot3d.el
+++ b/lisp/fg42/cubes/godot3d.el
@@ -36,5 +36,5 @@
     :mode "\\.gd\\'"))
 
 
-(provide 'cubes/godot3d)
+(provide 'fg42/cubes/godot3d)
 ;;; godot3d.el ends here
diff --git a/lisp/fg42/cubes/golang.el b/lisp/fg42/cubes/golang.el
index b03e7b3..8ba5c47 100644
--- a/lisp/fg42/cubes/golang.el
+++ b/lisp/fg42/cubes/golang.el
@@ -47,5 +47,5 @@
 
 
 
-(provide 'cubes/golang)
+(provide 'fg42/cubes/golang)
 ;;; golang.el ends here
diff --git a/lisp/fg42/cubes/golang/core.el b/lisp/fg42/cubes/golang/core.el
index 117db59..4e736d1 100644
--- a/lisp/fg42/cubes/golang/core.el
+++ b/lisp/fg42/cubes/golang/core.el
@@ -60,5 +60,5 @@
   (local-set-key (kbd "M-*") 'pop-tag-mark))
 
 
-(provide 'cubes/golang/core)
+(provide 'fg42/cubes/golang/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/graph.el b/lisp/fg42/cubes/graph.el
index 0bd3595..f2628b8 100644
--- a/lisp/fg42/cubes/graph.el
+++ b/lisp/fg42/cubes/graph.el
@@ -55,5 +55,5 @@ If =company= flag is enabled then =dot= autocomplete will be enabled as well."
       (setq graphviz-dot-indent-width indent-size))))
 
 
-(provide 'cubes/graph)
+(provide 'fg42/cubes/graph)
 ;;; graph.el ends here
diff --git a/lisp/fg42/cubes/groovy.el b/lisp/fg42/cubes/groovy.el
index 35331e1..aa01d1e 100644
--- a/lisp/fg42/cubes/groovy.el
+++ b/lisp/fg42/cubes/groovy.el
@@ -35,5 +35,5 @@
   (fpkg/use groovy-emacs-mode
     :defer t))
 
-(provide 'cubes/groovy)
+(provide 'fg42/cubes/groovy)
 ;;; groovy.el ends here
diff --git a/lisp/fg42/cubes/haml.el b/lisp/fg42/cubes/haml.el
index b6e964a..8367c94 100644
--- a/lisp/fg42/cubes/haml.el
+++ b/lisp/fg42/cubes/haml.el
@@ -36,5 +36,5 @@
     :mode "\\.haml\\'"))
 
 
-(provide 'cubes/haml)
+(provide 'fg42/cubes/haml)
 ;;; haml.el ends here
diff --git a/lisp/fg42/cubes/icons.el b/lisp/fg42/cubes/icons.el
index 225375e..30b1e43 100644
--- a/lisp/fg42/cubes/icons.el
+++ b/lisp/fg42/cubes/icons.el
@@ -37,5 +37,5 @@ package."
     :if (display-graphic-p)))
 
 
-(provide 'cubes/icons)
+(provide 'fg42/cubes/icons)
 ;;; icons.el ends here
diff --git a/lisp/fg42/cubes/irc.el b/lisp/fg42/cubes/irc.el
index 76388c8..29ea3b9 100644
--- a/lisp/fg42/cubes/irc.el
+++ b/lisp/fg42/cubes/irc.el
@@ -37,5 +37,5 @@
 
 
 
-(provide 'cubes/irc)
+(provide 'fg42/cubes/irc)
 ;;; irc.el ends here
diff --git a/lisp/fg42/cubes/irc/core.el b/lisp/fg42/cubes/irc/core.el
index 335c5bf..03db5c7 100644
--- a/lisp/fg42/cubes/irc/core.el
+++ b/lisp/fg42/cubes/irc/core.el
@@ -42,5 +42,5 @@
     (irc nil)))
 
 
-(provide 'cubes/irc/core)
+(provide 'fg42/cubes/irc/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/java.el b/lisp/fg42/cubes/java.el
index d924173..88b7cb7 100644
--- a/lisp/fg42/cubes/java.el
+++ b/lisp/fg42/cubes/java.el
@@ -65,5 +65,5 @@
 
 
 
-(provide 'cubes/java)
+(provide 'fg42/cubes/java)
 ;;; java.el ends here
diff --git a/lisp/fg42/cubes/julia.el b/lisp/fg42/cubes/julia.el
index 0b212ea..70a5738 100644
--- a/lisp/fg42/cubes/julia.el
+++ b/lisp/fg42/cubes/julia.el
@@ -46,5 +46,5 @@
     (add-hook 'julia-mode-hook #'lsp-mode)))
 
 
-(provide 'cubes/julia)
+(provide 'fg42/cubes/julia)
 ;;; julia.el ends here
diff --git a/lisp/fg42/cubes/keyboard.el b/lisp/fg42/cubes/keyboard.el
index ae6581f..5fa006a 100644
--- a/lisp/fg42/cubes/keyboard.el
+++ b/lisp/fg42/cubes/keyboard.el
@@ -24,5 +24,5 @@
 
 ;; TODO: Add support for HALMAK layout
 
-(provide 'cubes/keyboard)
+(provide 'fg42/cubes/keyboard)
 ;;; keyboard.el ends here
diff --git a/lisp/fg42/cubes/langtool.el b/lisp/fg42/cubes/langtool.el
index abdc2f2..4bc1480 100644
--- a/lisp/fg42/cubes/langtool.el
+++ b/lisp/fg42/cubes/langtool.el
@@ -48,5 +48,5 @@
         (setq lsp-ltex-languagetool-org-username user)
         (setq lsp-ltex-languagetool-org-api-key apikey)))))
 
-(provide 'cubes/langtool)
+(provide 'fg42/cubes/langtool)
 ;;; langtool.el ends here
diff --git a/lisp/fg42/cubes/mastodon.el b/lisp/fg42/cubes/mastodon.el
index a4b5dfa..4a14471 100644
--- a/lisp/fg42/cubes/mastodon.el
+++ b/lisp/fg42/cubes/mastodon.el
@@ -57,5 +57,5 @@ For more info on check out [[https://codeberg.org/martianh/mastodon.el]]"
               mastodon-active-user user)))))
 
 
-(provide 'cubes/mastodon)
+(provide 'fg42/cubes/mastodon)
 ;;; mastodon.el ends here
diff --git a/lisp/fg42/cubes/meissa.el b/lisp/fg42/cubes/meissa.el
index 6b7c339..8cf2a29 100644
--- a/lisp/fg42/cubes/meissa.el
+++ b/lisp/fg42/cubes/meissa.el
@@ -76,5 +76,5 @@
       (fg42/meissa-speech (fg42/get-x11-selection-text)))))
 
 
-(provide 'cubes/meissa)
+(provide 'fg42/cubes/meissa)
 ;;; meissa.el ends here
diff --git a/lisp/fg42/cubes/meson.el b/lisp/fg42/cubes/meson.el
index 346e9e9..c829adf 100644
--- a/lisp/fg42/cubes/meson.el
+++ b/lisp/fg42/cubes/meson.el
@@ -38,5 +38,5 @@ For more info checkout [[https://github.com/wentasah/meson-mode]]"
       (when-flag company
         (add-hook 'meson-mode-hook 'company-mode)))))
 
-(provide 'cubes/meson)
+(provide 'fg42/cubes/meson)
 ;;; meson.el ends here
diff --git a/lisp/fg42/cubes/modeline.el b/lisp/fg42/cubes/modeline.el
index d3b03b2..657902a 100644
--- a/lisp/fg42/cubes/modeline.el
+++ b/lisp/fg42/cubes/modeline.el
@@ -23,7 +23,7 @@
 ;;; Code:
 (require 'fpkg)
 (require 'fg42/cube)
-(require 'cubes/icons)
+(require 'fg42/cubes/icons)
 
 (autoload-cube 'fg42/statusbar-default
                "modeline/statusbar-default.el"
@@ -152,5 +152,5 @@ valuable information."
               (fg42/statusbar-mode t))))
 
 
-(provide 'cubes/modeline)
+(provide 'fg42/cubes/modeline)
 ;;; modeline.el ends here
diff --git a/lisp/fg42/cubes/nix.el b/lisp/fg42/cubes/nix.el
index b003d02..d5f78d3 100644
--- a/lisp/fg42/cubes/nix.el
+++ b/lisp/fg42/cubes/nix.el
@@ -39,5 +39,5 @@
                         :server-id 'nix)))))
 
 
-(provide 'cubes/nix)
+(provide 'fg42/cubes/nix)
 ;;; nix.el ends here
diff --git a/lisp/fg42/cubes/noether.el b/lisp/fg42/cubes/noether.el
index 8cfff4f..eeb7642 100644
--- a/lisp/fg42/cubes/noether.el
+++ b/lisp/fg42/cubes/noether.el
@@ -23,7 +23,7 @@
 ;;; Code:
 (require 'fpkg)
 (require 'fg42/cube)
-(require 'cubes/icons)
+(require 'fg42/cubes/icons)
 
 
 (->cube noether-mode
@@ -42,5 +42,5 @@ to Emacs modeline."
     (noether-global-mode)))
 
 
-(provide 'cubes/noether)
+(provide 'fg42/cubes/noether)
 ;;; noether.el ends here
diff --git a/lisp/fg42/cubes/notifications.el b/lisp/fg42/cubes/notifications.el
index 0c212cb..fb97fbf 100644
--- a/lisp/fg42/cubes/notifications.el
+++ b/lisp/fg42/cubes/notifications.el
@@ -38,5 +38,5 @@
     (require 'notifications)
     (ednc-mode 1)))
 
-(provide 'cubes/notifications)
+(provide 'fg42/cubes/notifications)
 ;;; notifications.el ends here
diff --git a/lisp/fg42/cubes/org.el b/lisp/fg42/cubes/org.el
index 997b6f5..aa9aa18 100644
--- a/lisp/fg42/cubes/org.el
+++ b/lisp/fg42/cubes/org.el
@@ -226,5 +226,5 @@ For more info on ~org-mode~ check out [[https://orgmode.org/]]"
           (require 'org-protocol))))))
 
 
-(provide 'cubes/org)
+(provide 'fg42/cubes/org)
 ;;; org.el ends here
diff --git a/lisp/fg42/cubes/project.el b/lisp/fg42/cubes/project.el
index b7149cb..73a7269 100644
--- a/lisp/fg42/cubes/project.el
+++ b/lisp/fg42/cubes/project.el
@@ -28,7 +28,7 @@
 
 (defcube fg42/projectile-cube
   "Projectile Cube"
-  :title "cubes/fg42/projectile-cube.org"
+  :title "fg42/cubes/fg42/projectile-cube.org"
   :flag projectile
   :flag-default t
 
@@ -51,5 +51,5 @@
       :after projectile)))
 
 
-(provide 'cubes/project)
+(provide 'fg42/cubes/project)
 ;;; project.el ends here
diff --git a/lisp/fg42/cubes/proof.el b/lisp/fg42/cubes/proof.el
index 8fe9b24..a63db04 100644
--- a/lisp/fg42/cubes/proof.el
+++ b/lisp/fg42/cubes/proof.el
@@ -45,5 +45,5 @@ For more info checkout [[https://github.com/idris-hackers/idris-mode]]"
   (add-hook 'idris-mode-hook #'flycheck-mode))
 
 
-(provide 'cubes/proof)
+(provide 'fg42/cubes/proof)
 ;;; proof.el ends here
diff --git a/lisp/fg42/cubes/python.el b/lisp/fg42/cubes/python.el
index d9214a8..4ec5177 100644
--- a/lisp/fg42/cubes/python.el
+++ b/lisp/fg42/cubes/python.el
@@ -137,5 +137,5 @@ interactive `pyvenv-workon' function before `lsp'"
   (fg42/python-cube-pyright))
 
 
-(provide 'cubes/python)
+(provide 'fg42/cubes/python)
 ;;; python.el ends here
diff --git a/lisp/fg42/cubes/region-expansion.el b/lisp/fg42/cubes/region-expansion.el
index a25c83f..d63ed89 100644
--- a/lisp/fg42/cubes/region-expansion.el
+++ b/lisp/fg42/cubes/region-expansion.el
@@ -32,5 +32,5 @@
   (fpkg/use expand-region
     :bind ("C-=" . er/expand-region)))
 
-(provide 'cubes/region-expansion)
+(provide 'fg42/cubes/region-expansion)
 ;;; region-expansion.el ends here
diff --git a/lisp/fg42/cubes/rigel.el b/lisp/fg42/cubes/rigel.el
index f1b4eac..620c014 100644
--- a/lisp/fg42/cubes/rigel.el
+++ b/lisp/fg42/cubes/rigel.el
@@ -54,5 +54,5 @@ functions in `fg42/rigel/` namespace. For example `fg42/rigel/read` function."
     (message "[Rigel] %s" event)))
 
 
-(provide 'cubes/rigel)
+(provide 'fg42/cubes/rigel)
 ;;; rigel.el ends here
diff --git a/lisp/fg42/cubes/rigel/core.el b/lisp/fg42/cubes/rigel/core.el
index 3e44f8d..a16223d 100644
--- a/lisp/fg42/cubes/rigel/core.el
+++ b/lisp/fg42/cubes/rigel/core.el
@@ -101,5 +101,5 @@
    (or (current-kill 0) "")))
 
 
-(provide 'cubes/rigel/core)
+(provide 'fg42/cubes/rigel/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/rust.el b/lisp/fg42/cubes/rust.el
index 0800bf7..568717b 100644
--- a/lisp/fg42/cubes/rust.el
+++ b/lisp/fg42/cubes/rust.el
@@ -60,5 +60,5 @@ For more info on check out [[https://rust-analyzer.github.io]]"
     ))
 
 
-(provide 'cubes/rust)
+(provide 'fg42/cubes/rust)
 ;;; rust.el ends here
diff --git a/lisp/fg42/cubes/scheme.el b/lisp/fg42/cubes/scheme.el
index 99814d1..006890f 100644
--- a/lisp/fg42/cubes/scheme.el
+++ b/lisp/fg42/cubes/scheme.el
@@ -46,5 +46,5 @@ For more info checkout [[https://codeberg.org/rgherdt/emacs-lsp-scheme]]"
     (setq lsp-scheme-implementation "guile")))
 
 
-(provide 'cubes/scheme)
+(provide 'fg42/cubes/scheme)
 ;;; scheme.el ends here
diff --git a/lisp/fg42/cubes/snippets.el b/lisp/fg42/cubes/snippets.el
index 3e9797f..1bf92ce 100644
--- a/lisp/fg42/cubes/snippets.el
+++ b/lisp/fg42/cubes/snippets.el
@@ -26,7 +26,7 @@
 
 (defcube fg42/yasnippet-cube
   "Yasnippet cube"
-  :title "cubes/fg42/yasnippet-cube.org"
+  :title "fg42/cubes/fg42/yasnippet-cube.org"
   :flag yasnippet
   :flag-default t
 
@@ -36,7 +36,7 @@
     :init
     (let* ((snippet-home (expand-file-name "snippets"
                                           (file-name-directory (locate-library "yasnippet-snippets"))))
-           (local-snippet (expand-file-name "core/cubes/snippets" fg42-home))
+           (local-snippet (expand-file-name "core/fg42/cubes/snippets" fg42-home))
            (user-snippets (or (plist-get fg42/yasnippet-cube-params :snippets-dir)
                               ;; Just to make sure that we don't return nil. Since
                               ;; yas-snippet-dirs shoud not contain nil value
@@ -46,5 +46,5 @@
       (yas-global-mode 1))))
 
 
-(provide 'cubes/snippets)
+(provide 'fg42/cubes/snippets)
 ;;; snippets.el ends here
diff --git a/lisp/fg42/cubes/terminal.el b/lisp/fg42/cubes/terminal.el
index f38b7e6..dc1d96b 100644
--- a/lisp/fg42/cubes/terminal.el
+++ b/lisp/fg42/cubes/terminal.el
@@ -36,5 +36,5 @@
         (setq vterm-shell _shell)))))
 
 
-(provide 'cubes/terminal)
+(provide 'fg42/cubes/terminal)
 ;;; terminal.el ends here
diff --git a/lisp/fg42/cubes/terraform.el b/lisp/fg42/cubes/terraform.el
index fbae75f..2ecd773 100644
--- a/lisp/fg42/cubes/terraform.el
+++ b/lisp/fg42/cubes/terraform.el
@@ -31,7 +31,7 @@
 
 (defcube fg42/terraform-cube
   "terraform cube"
-  :title "cubes/fg42/terraform-cube.org"
+  :title "fg42/cubes/fg42/terraform-cube.org"
   :flag terraform
   :flag-default t
 
@@ -53,5 +53,5 @@
           (add-hook 'terraform-mode-hook #'lsp))))))
 
 
-(provide 'cubes/terraform)
+(provide 'fg42/cubes/terraform)
 ;;; terraform.el ends here
diff --git a/lisp/fg42/cubes/themes.el b/lisp/fg42/cubes/themes.el
index 106bf1d..62495e5 100644
--- a/lisp/fg42/cubes/themes.el
+++ b/lisp/fg42/cubes/themes.el
@@ -66,5 +66,5 @@ https://emacsthemes.com/themes/badwolf-theme.html"
                 (enable-theme 'badwolf)))))
 
 
-(provide 'cubes/themes)
+(provide 'fg42/cubes/themes)
 ;;; themes.el ends here
diff --git a/lisp/fg42/cubes/wm.el b/lisp/fg42/cubes/wm.el
index 73eb699..1d08e4d 100644
--- a/lisp/fg42/cubes/wm.el
+++ b/lisp/fg42/cubes/wm.el
@@ -45,5 +45,5 @@
     (error "[SKIP] WM flag is not active")))
 
 
-(provide 'cubes/wm)
+(provide 'fg42/cubes/wm)
 ;;; wm.el ends here
diff --git a/lisp/fg42/cubes/wm/core.el b/lisp/fg42/cubes/wm/core.el
index c1f880e..86cdf5c 100644
--- a/lisp/fg42/cubes/wm/core.el
+++ b/lisp/fg42/cubes/wm/core.el
@@ -157,5 +157,5 @@
   )
 
 
-(provide 'cubes/wm/core)
+(provide 'fg42/cubes/wm/core)
 ;;; core.el ends here
diff --git a/lisp/fg42/cubes/zig.el b/lisp/fg42/cubes/zig.el
index 1e6fc0f..bffcdd1 100644
--- a/lisp/fg42/cubes/zig.el
+++ b/lisp/fg42/cubes/zig.el
@@ -39,5 +39,5 @@
       (setq lsp-zig-zls-executable zls-path))))
 
 
-(provide 'cubes/zig)
+(provide 'fg42/cubes/zig)
 ;;; zig.el ends here
diff --git a/lisp/fg42/utils.el b/lisp/fg42/utils.el
index 01b21ac..8700dfa 100644
--- a/lisp/fg42/utils.el
+++ b/lisp/fg42/utils.el
@@ -167,7 +167,7 @@ last item in second form, etc."
   "A wrapper for autloading FN at FILE with the given DOCSTRING.
 This macro looks inside of the cubes directories.  If the INTERACTIVE param
 is non-nil value it means that the function can be called interactively."
-  `(autoload ,fn (expand-file-name (format  "core/cubes/%s" ,file) fg42-home)
+  `(autoload ,fn (expand-file-name (format  "core/fg42/cubes/%s" ,file) fg42-home)
      ,docstring ,interactive))