diff --git a/init.el b/init.el
index 80210da..188020a 100644
--- a/init.el
+++ b/init.el
@@ -86,27 +86,27 @@
   (package-initialize)
 
   ;; --------------------------------------------------------------------------
-  ;; Load `init-packages'.
+  ;; Load `emodule'.
   ;; --------------------------------------------------------------------------
 
-  (add-to-list 'load-path "~/.emacs.d/init-packages")
-  (require 'init-packages)
+  (add-to-list 'load-path "~/.emacs.d/emodule")
+  (require 'emodule)
 
   ;; --------------------------------------------------------------------------
   ;; Load modules.
   ;; --------------------------------------------------------------------------
 
-  (init-packages/init '(
-                        editing
-                        emacs
-                        files
-                        helm
-                        parentheses
-                        programming
-                        terminal
-                        version-control
-                        workflow
-                        ))
+  (emodule/init '(
+                  editing
+                  emacs
+                  files
+                  helm
+                  parentheses
+                  programming
+                  terminal
+                  version-control
+                  workflow
+                  ))
 
 
   ;; *********************************************************************** ;;
diff --git a/modules/editing.el b/modules/editing.el
index bb7ff0e..8a0f7fa 100644
--- a/modules/editing.el
+++ b/modules/editing.el
@@ -15,7 +15,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/editing-packages
+(setq emodule/editing-packages
 
       '(duplicate-thing
         expand-region
@@ -29,7 +29,7 @@
 
 ;; Configuration:
 
-(defun init-packages/init-editing ()
+(defun emodule/editing-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Duplicate things.
diff --git a/modules/emacs.el b/modules/emacs.el
index f148b95..6fe9fb6 100644
--- a/modules/emacs.el
+++ b/modules/emacs.el
@@ -15,7 +15,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/emacs-packages
+(setq emodule/emacs-packages
 
       '(info+
         discover-my-major
@@ -30,7 +30,7 @@
 
 ;;; Configuration:
 
-(defun init-packages/init-emacs ()
+(defun emodule/emacs-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Help extensions.
@@ -107,7 +107,7 @@
     refresh these colours."
 
     (when (and (fboundp 'fci-mode)
-               (fci-mode))
+               fci-mode)
       (fci-mode 1))
 
     (when (and (fboundp 'highlight-parentheses-mode)
diff --git a/modules/files.el b/modules/files.el
index c8e2d18..4161ebb 100644
--- a/modules/files.el
+++ b/modules/files.el
@@ -15,7 +15,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/files-packages
+(setq emodule/files-packages
 
       '(vlf)
 
@@ -23,7 +23,7 @@
 
 ;;; Configuration:
 
-(defun init-packages/init-files ()
+(defun emodule/files-init ()
 
   ;; --------------------------------------------------------------------------
   ;; View large files.
diff --git a/modules/helm.el b/modules/helm.el
index b7a4306..071f92a 100644
--- a/modules/helm.el
+++ b/modules/helm.el
@@ -15,7 +15,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/helm-packages
+(setq emodule/helm-packages
 
       '(helm
         helm-descbinds
@@ -25,7 +25,7 @@
 
 ;;; Configuration:
 
-(defun init-packages/init-helm ()
+(defun emodule/helm-init ()
 
   (use-package helm
     :init
diff --git a/modules/parentheses.el b/modules/parentheses.el
index f36e22f..8c36bc3 100644
--- a/modules/parentheses.el
+++ b/modules/parentheses.el
@@ -16,7 +16,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/parentheses-packages
+(setq emodule/parentheses-packages
 
       '(highlight-parentheses
         rainbow-delimiters
@@ -26,7 +26,7 @@
 
 ;; Configuration:
 
-(defun init-packages/init-parentheses ()
+(defun emodule/parentheses-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Highlight parentheses - this package does not use faces for colours,
diff --git a/modules/programming.el b/modules/programming.el
index 6e0e744..7253749 100644
--- a/modules/programming.el
+++ b/modules/programming.el
@@ -16,7 +16,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/programming-packages
+(setq emodule/programming-packages
 
       '(company
         flycheck
@@ -31,7 +31,7 @@
 
 ;; Configuration:
 
-(defun init-packages/init-programming ()
+(defun emodule/programming-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Company - complete anything.
diff --git a/modules/terminal.el b/modules/terminal.el
index bc135ef..b968af7 100644
--- a/modules/terminal.el
+++ b/modules/terminal.el
@@ -16,7 +16,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/terminal-packages
+(setq emodule/terminal-packages
 
       '()
 
@@ -24,7 +24,7 @@
 
 ;; Configuration:
 
-(defun init-packages/init-terminal ()
+(defun emodule/terminal-init ()
 
   (use-package term
     :init
diff --git a/modules/version-control.el b/modules/version-control.el
index d1b04b2..f527958 100644
--- a/modules/version-control.el
+++ b/modules/version-control.el
@@ -16,7 +16,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/version-control-packages
+(setq emodule/version-control-packages
 
       '(magit
         diff-hl)
@@ -25,7 +25,7 @@
 
 ;;; Configuration:
 
-(defun init-packages/init-version-control ()
+(defun emodule/version-control-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Load and configure `magit'.
diff --git a/modules/workflow.el b/modules/workflow.el
index 7e7a69e..152af90 100644
--- a/modules/workflow.el
+++ b/modules/workflow.el
@@ -16,7 +16,7 @@
 
 ;;; Required packages:
 
-(setq init-packages/workflow-packages
+(setq emodule/workflow-packages
 
       '(workgroups2)
 
@@ -24,7 +24,7 @@
 
 ;;; Configuration:
 
-(defun init-packages/init-workflow ()
+(defun emodule/workflow-init ()
 
   ;; --------------------------------------------------------------------------
   ;; Enable `workgroups'.