diff --git a/Cask b/Cask
index 0e6b34ca6..bf8ab15dd 100644
--- a/Cask
+++ b/Cask
@@ -222,7 +222,7 @@
 (depends-on "flycheck-rust")
 
 ;; Scala -- modules/module-scala.el
-(depends-on "scala-mode2")
+(depends-on "scala-mode")
 (depends-on "sbt-mode")
 (depends-on "ensime")
 
diff --git a/modules/module-scala.el b/modules/module-scala.el
index 6c2808d28..d5885678b 100644
--- a/modules/module-scala.el
+++ b/modules/module-scala.el
@@ -1,14 +1,14 @@
 ;;; module-scala.el
 
-(use-package scala-mode2
-  :mode ("\\.s\\(cala\\|bt\\)$" . scala-mode)
+(use-package scala-mode
+  :mode "\\.s\\(cala\\|bt\\)$"
   :init (add-hook 'scala-mode-hook 'turn-on-eldoc-mode)
   :config
   (def-company-backend! scala-mode '(ensime-company (company-yasnippet)))
   (def-docset! scala-mode "scala"))
 
 (use-package sbt-mode
-  :after scala-mode2)
+  :after scala-mode)
 
 (use-package ensime
   :commands (ensime ensime-mode ensime-scala-mode-hook)