diff --git a/layers/+tools/dockerfile/README.org b/layers/+tools/docker/README.org
similarity index 97%
rename from layers/+tools/dockerfile/README.org
rename to layers/+tools/docker/README.org
index 9610553c9..286a4a58f 100644
--- a/layers/+tools/dockerfile/README.org
+++ b/layers/+tools/docker/README.org
@@ -1,10 +1,11 @@
-#+TITLE: Dockerfile contribution layer for Spacemacs
+#+TITLE: Docker layer
 
 [[file:img/docker.png]]
 
 * Table of Contents                                         :TOC_4_org:noexport:
  - [[Description][Description]]
  - [[Install][Install]]
+ - [[Usage][Usage]]
    - [[TRAMP access to docker containers][TRAMP access to docker containers]]
  - [[Key bindings][Key bindings]]
 
@@ -20,6 +21,7 @@ To use this configuration layer, add it to your =~/.spacemacs=. You will need to
 add =docker= to the existing =dotspacemacs-configuration-layers= list in this
 file.
 
+* Usage
 ** TRAMP access to docker containers
 This relies on the [[https://github.com/emacs-pe/docker-tramp.el][docker-tramp]] package which uses ~docker exec~ available in
 docker versions > 1.3.
diff --git a/layers/+tools/dockerfile/img/docker.png b/layers/+tools/docker/img/docker.png
similarity index 100%
rename from layers/+tools/dockerfile/img/docker.png
rename to layers/+tools/docker/img/docker.png
diff --git a/layers/+tools/dockerfile/packages.el b/layers/+tools/docker/packages.el
similarity index 82%
rename from layers/+tools/dockerfile/packages.el
rename to layers/+tools/docker/packages.el
index f8e730e3b..b33c48074 100644
--- a/layers/+tools/dockerfile/packages.el
+++ b/layers/+tools/docker/packages.el
@@ -1,4 +1,4 @@
-;;; packages.el --- dockerfile Layer packages File for Spacemacs
+;;; packages.el --- docker Layer packages File for Spacemacs
 ;;
 ;; Copyright (c) 2012-2015 Sylvain Benner
 ;; Copyright (c) 2015 Alan Zimmerman & Contributors
@@ -10,14 +10,14 @@
 ;;
 ;;; License: GPLv3
 
-(defconst dockerfile-packages
+(defconst docker-packages
   '(
     docker
     docker-tramp
     dockerfile-mode
     ))
 
-(defun dockerfile/init-docker ()
+(defun docker/init-docker ()
   (use-package docker
     :defer t
     :init
@@ -42,12 +42,12 @@
       (evilified-state-evilify-map docker-images-mode-map
         :mode docker-images-mode))))
 
-(defun dockerfile/init-docker-tramp ()
+(defun docker/init-docker-tramp ()
   (use-package docker-tramp
     :defer t))
 
-(defun dockerfile/init-dockerfile-mode ()
-  (use-package dockerfile-mode
+(defun docker/init-dockerfile-mode ()
+  (use-package docker-mode
     :defer t
     :config (evil-leader/set-key-for-mode 'dockerfile-mode
               "mcb" 'dockerfile-build-buffer)))