diff --git a/core/core-configuration-layer.el b/core/core-configuration-layer.el
index ab2cb7775..a07956113 100644
--- a/core/core-configuration-layer.el
+++ b/core/core-configuration-layer.el
@@ -900,7 +900,7 @@ path."
       (let* ((layer-name (if (listp layer) (car layer) layer))
              (layer-path (ht-get configuration-layer-paths layer-name)))
         (if (stringp layer-path)
-            (unless (string-match-p "+distribution" layer-path)
+            (unless (string-match-p "+distributions" layer-path)
               (configuration-layer/declare-layer layer))
           (spacemacs-buffer/warning "Unknown layer %s declared in dotfile."
                                     layer-name))))
diff --git a/core/core-dotspacemacs.el b/core/core-dotspacemacs.el
index 87b6f841c..cbe7f4031 100644
--- a/core/core-dotspacemacs.el
+++ b/core/core-dotspacemacs.el
@@ -50,7 +50,7 @@ exists. Otherwise, fallback to ~/.spacemacs")
 
 (defvar dotspacemacs-distribution 'spacemacs
   "Base distribution to use. This is a layer contained in the directory
-`+distribution'. For now available distributions are `spacemacs-base'
+`+distributions'. For now available distributions are `spacemacs-base'
 or `spacemacs'.")
 
 (defvar dotspacemacs-elpa-https t
diff --git a/doc/FAQ.org b/doc/FAQ.org
index 95f36fcd8..45090f197 100644
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@@ -123,7 +123,7 @@ experience.
 
 Set the distribution with =dotspacemacs-distribution= variable. The default is
 =spacemacs=. For more information as to what is included, check out the
-=packages.el= file in the respective folders in the =+distribution= folder of
+=packages.el= file in the respective folders in the =+distributions= folder of
 the =layers/= directory.
 
 ** Should I place my settings in =user-init= or =user-config=?
diff --git a/layers/+distribution/spacemacs-base/config.el b/layers/+distributions/spacemacs-base/config.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/config.el
rename to layers/+distributions/spacemacs-base/config.el
diff --git a/layers/+distribution/spacemacs-base/funcs.el b/layers/+distributions/spacemacs-base/funcs.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/funcs.el
rename to layers/+distributions/spacemacs-base/funcs.el
diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distributions/spacemacs-base/keybindings.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/keybindings.el
rename to layers/+distributions/spacemacs-base/keybindings.el
diff --git a/layers/+distribution/spacemacs-base/local/evil-evilified-state/evil-evilified-state.el b/layers/+distributions/spacemacs-base/local/evil-evilified-state/evil-evilified-state.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/local/evil-evilified-state/evil-evilified-state.el
rename to layers/+distributions/spacemacs-base/local/evil-evilified-state/evil-evilified-state.el
diff --git a/layers/+distribution/spacemacs-base/local/holy-mode/holy-mode.el b/layers/+distributions/spacemacs-base/local/holy-mode/holy-mode.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/local/holy-mode/holy-mode.el
rename to layers/+distributions/spacemacs-base/local/holy-mode/holy-mode.el
diff --git a/layers/+distribution/spacemacs-base/local/hybrid-mode/hybrid-mode.el b/layers/+distributions/spacemacs-base/local/hybrid-mode/hybrid-mode.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/local/hybrid-mode/hybrid-mode.el
rename to layers/+distributions/spacemacs-base/local/hybrid-mode/hybrid-mode.el
diff --git a/layers/+distribution/spacemacs-base/packages.el b/layers/+distributions/spacemacs-base/packages.el
similarity index 100%
rename from layers/+distribution/spacemacs-base/packages.el
rename to layers/+distributions/spacemacs-base/packages.el
diff --git a/layers/+distribution/spacemacs-bootstrap/config.el b/layers/+distributions/spacemacs-bootstrap/config.el
similarity index 100%
rename from layers/+distribution/spacemacs-bootstrap/config.el
rename to layers/+distributions/spacemacs-bootstrap/config.el
diff --git a/layers/+distribution/spacemacs-bootstrap/funcs.el b/layers/+distributions/spacemacs-bootstrap/funcs.el
similarity index 100%
rename from layers/+distribution/spacemacs-bootstrap/funcs.el
rename to layers/+distributions/spacemacs-bootstrap/funcs.el
diff --git a/layers/+distribution/spacemacs-bootstrap/packages.el b/layers/+distributions/spacemacs-bootstrap/packages.el
similarity index 100%
rename from layers/+distribution/spacemacs-bootstrap/packages.el
rename to layers/+distributions/spacemacs-bootstrap/packages.el
diff --git a/layers/+distribution/spacemacs/layers.el b/layers/+distributions/spacemacs/layers.el
similarity index 100%
rename from layers/+distribution/spacemacs/layers.el
rename to layers/+distributions/spacemacs/layers.el