diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index 21c4b93..58a492e 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -192,7 +192,7 @@ Executable ghc-mod
                       , GHCMod.Options.Commands
                       , GHCMod.Version
                       , GHCMod.Options.DocUtils
-                      , GHCMod.Options.ShellEscape
+                      , GHCMod.Options.ShellParse
   GHC-Options:          -Wall -fno-warn-deprecations -threaded
   Default-Extensions:   ConstraintKinds, FlexibleContexts
   HS-Source-Dirs:       src
@@ -268,7 +268,7 @@ Test-Suite spec
                         PathsAndFilesSpec
                         HomeModuleGraphSpec
                         FileMappingSpec
-                        ShellEscapeSpec
+                        ShellParseSpec
 
   Build-Depends:        hspec >= 2.0.0
   if impl(ghc == 7.4.*)
diff --git a/src/GHCMod/Options.hs b/src/GHCMod/Options.hs
index 63bc933..fd3c95b 100644
--- a/src/GHCMod/Options.hs
+++ b/src/GHCMod/Options.hs
@@ -27,7 +27,7 @@ import Control.Arrow
 import GHCMod.Options.Commands
 import GHCMod.Version
 import GHCMod.Options.DocUtils
-import GHCMod.Options.ShellEscape
+import GHCMod.Options.ShellParse
 
 parseArgs :: IO (Options, GhcModCommands)
 parseArgs =
diff --git a/src/GHCMod/Options/ShellEscape.hs b/src/GHCMod/Options/ShellParse.hs
similarity index 97%
rename from src/GHCMod/Options/ShellEscape.hs
rename to src/GHCMod/Options/ShellParse.hs
index 1e45d9c..5799906 100644
--- a/src/GHCMod/Options/ShellEscape.hs
+++ b/src/GHCMod/Options/ShellParse.hs
@@ -13,7 +13,7 @@
 --
 -- You should have received a copy of the GNU Affero General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-module GHCMod.Options.ShellEscape (parseCmdLine) where
+module GHCMod.Options.ShellParse (parseCmdLine) where
 
 import Data.Char
 import Data.Maybe
diff --git a/test/ShellEscapeSpec.hs b/test/ShellParseSpec.hs
similarity index 94%
rename from test/ShellEscapeSpec.hs
rename to test/ShellParseSpec.hs
index 4b0d997..3d02f43 100644
--- a/test/ShellEscapeSpec.hs
+++ b/test/ShellParseSpec.hs
@@ -1,7 +1,7 @@
-module ShellEscapeSpec where
+module ShellParseSpec where
 
 
-import GHCMod.Options.ShellEscape
+import GHCMod.Options.ShellParse
 
 import Test.Hspec