diff --git a/core/core-auto-insert.el b/core/core-auto-insert.el
index 62a23964b..5bf78c1dc 100644
--- a/core/core-auto-insert.el
+++ b/core/core-auto-insert.el
@@ -27,11 +27,11 @@
   (add-template! "/\\.rspec$"                      "@@.rspec"         'rspec-mode)
   (add-template! "/spec_helper\\.rb$"              "@@helper"         'rspec-mode t)
   (add-template! "_spec\\.rb$"                     "@@"               'rspec-mode t)
-  (add-template! "/Rakefile$"                      "@@Rakefile"       'ruby-mode t)
-  (add-template! "/Gemfile$"                       "@@Gemfile"        'ruby-mode t)
-  (add-template! "\\.gemspec$"                     "@@.gemspec"       'ruby-mode t)
-  (add-template! "/lib/.+\\.rb$"                   "@@module"         'ruby-mode t)
-  (add-template! "\\.rb$"                          "@@"               'ruby-mode)
+  (add-template! "/Rakefile$"                      "@@Rakefile"       'enh-ruby-mode t)
+  (add-template! "/Gemfile$"                       "@@Gemfile"        'enh-ruby-mode t)
+  (add-template! "\\.gemspec$"                     "@@.gemspec"       'enh-ruby-mode t)
+  (add-template! "/lib/.+\\.rb$"                   "@@module"         'enh-ruby-mode t)
+  (add-template! "\\.rb$"                          "@@"               'enh-ruby-mode)
 
   ;; Python
   ;; (add-template! "tests?/test_.+\\.py$"         "@@"               'nose-mode)
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 95e277a3c..4efbab7ca 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -3,20 +3,20 @@
 ;; Silence the byte-compiler
 (eval-when-compile (require 'defuns-quickrun))
 
-(use-package ruby-mode
+(use-package enh-ruby-mode
   :mode ("\\.r[bu]$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$"
          "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
   :interpreter "ruby"
   :init
-  (add-hook! ruby-mode 'narf|enable-tab-width-2)
-  (build-for! ruby-mode "rake %s" "Rakefile")
+  (add-hook! enh-ruby-mode 'narf|enable-tab-width-2)
+  (build-for! enh-ruby-mode "rake %s" "Rakefile")
   :config
-	;;; Formatting
+  ;; Formatting
   (setq ruby-indent-level      2
         ruby-deep-indent-paren t)
 
   ;; Don't interfere with my custom RET behavior
-  (define-key ruby-mode-map [?\n] nil)
+  (define-key enh-ruby-mode-map [?\n] nil)
 
   ;; Rakefiles ;;;;;;;;;;;;;;;;;;;;;;;;;;;
   (define-minor-mode rake-mode
@@ -57,48 +57,48 @@
 (use-package inf-ruby
   :commands (inf-ruby inf-ruby-console-auto)
   :config
-  (evil-set-initial-state 'inf-ruby-mode 'insert)
+  (evil-set-initial-state 'inf-enh-ruby-mode 'insert)
   (after! company
     (require 'company-inf-ruby)
-    (add-company-backend! inf-ruby-mode (inf-ruby))))
+    (add-company-backend! inf-enh-ruby-mode (inf-ruby))))
 
 (use-package robe
   :commands (robe-mode robe-start ruby-load-file)
   :init
   (add-hook! after-save 'narf|ruby-load-file)
-  (add-hook! ruby-mode 'narf|enable-robe-maybe)
+  (add-hook! enh-ruby-mode 'narf|enable-robe-maybe)
   :config
   (after! company
     (require 'company-robe)
-    (add-company-backend! ruby-mode (robe))))
+    (add-company-backend! enh-ruby-mode (robe))))
 
 (use-package ruby-refactor
   :after emr
-  :init (add-hook! ruby-mode 'emr-initialize)
+  :init (add-hook! enh-ruby-mode 'emr-initialize)
   :config
   (emr-declare-command 'ruby-toggle-block
     :title "toggle block"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (not (use-region-p))))
   (emr-declare-command 'ruby-refactor-extract-to-method
     :title "extract method"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (use-region-p)))
   (emr-declare-command 'ruby-refactor-extract-local-variable
     :title "extract local variable"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (use-region-p)))
   (emr-declare-command 'ruby-refactor-extract-constant
     :title "extract constant"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (use-region-p)))
   (emr-declare-command 'ruby-refactor-add-parameter
     :title "add parameter"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (not (use-region-p))))
   (emr-declare-command 'ruby-refactor-extract-to-let
     :title "extract to let"
-    :modes 'ruby-mode
+    :modes 'enh-ruby-mode
     :predicate (lambda () (use-region-p))))
 
 (provide 'module-ruby)