diff --git a/src/beautify.coffee b/src/beautify.coffee
index 70ade1d..f09b6f9 100644
--- a/src/beautify.coffee
+++ b/src/beautify.coffee
@@ -186,7 +186,7 @@ beautify = ({onSave}) ->
 beautifyFilePath = (filePath, callback) ->
 
     # Show in progress indicate on file's tree-view entry
-    $ ?= require("space-pen").$
+    $ ?= require("atom-space-pen-views").$
     $el = $(".icon-file-text[data-path=\"#{filePath}\"]")
     $el.addClass('beautifying')
 
@@ -243,7 +243,7 @@ beautifyDirectory = ({target}) ->
 
 
     # Show in progress indicate on directory's tree-view entry
-    $ ?= require("space-pen").$
+    $ ?= require("atom-space-pen-views").$
     $el = $(".icon-file-directory[data-path=\"#{dirPath}\"]")
     $el.addClass('beautifying')
 
diff --git a/src/views/loading-view.coffee b/src/views/loading-view.coffee
index 8bdb384..284effa 100644
--- a/src/views/loading-view.coffee
+++ b/src/views/loading-view.coffee
@@ -1,5 +1,4 @@
-{View} = require 'space-pen'
-{TextEditorView} = require 'atom-space-pen-views'
+{View, TextEditorView} = require 'atom-space-pen-views'
 
 module.exports =
 class LoadingView extends View
diff --git a/src/views/message-view.coffee b/src/views/message-view.coffee
index 44b705c..22512e5 100644
--- a/src/views/message-view.coffee
+++ b/src/views/message-view.coffee
@@ -1,4 +1,4 @@
-{$, $$, $$$, View} = require "atom"
+{$, $$, $$$, View} = require "atom-space-pen-views"
 
 module.exports =
 class MessageView extends View