diff --git a/contrib/slime/README.org b/contrib/!lang/common-lisp/README.org
similarity index 89%
rename from contrib/slime/README.org
rename to contrib/!lang/common-lisp/README.org
index 57af739d5..ac6926bf7 100644
--- a/contrib/slime/README.org
+++ b/contrib/!lang/common-lisp/README.org
@@ -1,4 +1,4 @@
-#+TITLE: SLIME contribution layer for Spacemacs
+#+TITLE: Common Lisp contribution layer for Spacemacs
 
 [[file:img/slime.png]]
 
@@ -14,7 +14,7 @@
 
 * Description
 
-A Spacemacs contribution layer for [[https://github.com/slime/slime][SLIME]].
+A Spacemacs contribution layer providing Common Lisp support via [[https://github.com/slime/slime][SLIME]].
 
 * Install
 
@@ -26,10 +26,10 @@ if it was a distribution install.
 To use this contribution, add it to your =~/.spacemacs=
 
 #+BEGIN_SRC emacs-lisp
-  (setq-default dotspacemacs-configuration-layers '(slime))
+  (setq-default dotspacemacs-configuration-layers '(common-lisp))
 #+END_SRC
 
-This layer defaults to using [[http://www.sbcl.org/][sbcl]]. If you wan to use a different implementation
+This layer defaults to using [[http://www.sbcl.org/][sbcl]]. If you want to use a different implementation
 of Common Lisp, you can specify it in your =~/.spacemacs=
 
 #+BEGIN_SRC emacs-lisp
diff --git a/contrib/slime/extensions.el b/contrib/!lang/common-lisp/extensions.el
similarity index 91%
rename from contrib/slime/extensions.el
rename to contrib/!lang/common-lisp/extensions.el
index 6d5e3752f..d716334fa 100644
--- a/contrib/slime/extensions.el
+++ b/contrib/!lang/common-lisp/extensions.el
@@ -1,4 +1,4 @@
-;;; extensions.el --- slime Layer extensions File for Spacemacs
+;;; extensions.el --- Common Lisp Layer extensions File for Spacemacs
 ;;
 ;; Copyright (c) 2012-2014 Sylvain Benner
 ;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
diff --git a/contrib/slime/img/slime.png b/contrib/!lang/common-lisp/img/slime.png
similarity index 100%
rename from contrib/slime/img/slime.png
rename to contrib/!lang/common-lisp/img/slime.png
diff --git a/contrib/slime/packages.el b/contrib/!lang/common-lisp/packages.el
similarity index 88%
rename from contrib/slime/packages.el
rename to contrib/!lang/common-lisp/packages.el
index 583d0c83b..306c93269 100644
--- a/contrib/slime/packages.el
+++ b/contrib/!lang/common-lisp/packages.el
@@ -1,4 +1,4 @@
-;;; packages.el --- slime Layer packages File for Spacemacs
+;;; packages.el --- Common Lisp Layer packages File for Spacemacs
 ;;
 ;; Copyright (c) 2012-2014 Sylvain Benner
 ;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
@@ -10,10 +10,10 @@
 ;;
 ;;; License: GPLv3
 
-(setq slime-packages
-  '(slime))
+(setq common-lisp-packages
+      '(slime))
 
-(defun slime/init-slime ()
+(defun common-lisp/init-slime ()
   (use-package slime
     :commands slime-mode
     :init
@@ -32,14 +32,13 @@
         (smartparens-strict-mode -1)
         (turn-off-smartparens-mode))
       (add-hook 'slime-repl-mode-hook #'slime/disable-smartparens)
-      (add-to-hooks 'slime-mode '(lisp-mode-hook scheme-mode-hook)))
+      (add-to-hooks 'slime-mode '(lisp-mode-hook)))
     :config
     (progn
       (slime-setup)
       (dolist (m `(,slime-mode-map ,slime-repl-mode-map))
         (define-key m [(tab)] 'slime-fuzzy-complete-symbol))
-      (dolist (m '(lisp-mode
-                   scheme-mode))
+      (dolist (m '(lisp-mode))
         (evil-leader/set-key-for-mode m
           "mcc" 'slime-compile-file
           "mcC" 'slime-compile-and-load-file