diff --git a/Makefile b/Makefile
index f4d4ad6..a0d8d79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-all: shpell .tests
+all: shellcheck .tests
 	: Done
 	
-shpell: regardless
-	: Conditionally compiling shpell
-	ghc --make shpell
+shellcheck: regardless
+	: Conditionally compiling shellcheck
+	ghc --make shellcheck
 
 .tests: *.hs */*.hs
 	: Running unit tests
 	./test/runQuack && touch .tests
 
 clean:
-	rm -f .tests shpell  *.hi *.o  Shpell/*.hi Shpell/*.o
+	rm -f .tests shellcheck  *.hi *.o  ShellCheck/*.hi ShellCheck/*.o
 
 regardless:
 	
diff --git a/Shpell/Analytics.hs b/ShellCheck/Analytics.hs
similarity index 99%
rename from Shpell/Analytics.hs
rename to ShellCheck/Analytics.hs
index 039fa98..06c6387 100644
--- a/Shpell/Analytics.hs
+++ b/ShellCheck/Analytics.hs
@@ -1,6 +1,6 @@
-module Shpell.Analytics where
+module ShellCheck.Analytics where
 
-import Shpell.Parser
+import ShellCheck.Parser
 import Control.Monad
 import Control.Monad.State
 import qualified Data.Map as Map
diff --git a/Shpell/Parser.hs b/ShellCheck/Parser.hs
similarity index 99%
rename from Shpell/Parser.hs
rename to ShellCheck/Parser.hs
index 90a4aac..dc22e27 100644
--- a/Shpell/Parser.hs
+++ b/ShellCheck/Parser.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE NoMonomorphismRestriction #-}
 
-module Shpell.Parser (Token(..), Id(..), Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), notesFromMap, Metadata(..), doAnalysis, doStackAnalysis, doTransform, sortNotes) where
+module ShellCheck.Parser (Token(..), Id(..), Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), notesFromMap, Metadata(..), doAnalysis, doStackAnalysis, doTransform, sortNotes) where
 
 import Text.Parsec
 import Debug.Trace
diff --git a/ShellCheck/Simple.hs b/ShellCheck/Simple.hs
new file mode 100644
index 0000000..19f455c
--- /dev/null
+++ b/ShellCheck/Simple.hs
@@ -0,0 +1,33 @@
+module ShellCheck.Simple (shellcheckCheck, ShellCheckComment, shellcheckLine, shellcheckColumn, shellcheckSeverity, shellcheckComment) where
+
+import ShellCheck.Parser
+import ShellCheck.Analytics
+import Data.Maybe
+import Text.Parsec.Pos
+import Data.List
+
+shellcheckCheck :: String -> [ShellCheckComment]
+shellcheckCheck script =
+    let (ParseResult result notes) = parseShell "-" script in
+        let allNotes = notes ++ (concat $ maybeToList $ do
+            (tree, map) <- result
+            let newMap = runAllAnalytics tree map
+            return $ notesFromMap newMap
+            )
+        in
+            map formatNote $ nub $ sortNotes allNotes
+
+data ShellCheckComment = ShellCheckComment { shellcheckLine :: Int, shellcheckColumn :: Int, shellcheckSeverity :: String, shellcheckComment :: String }
+
+
+instance Show ShellCheckComment where
+    show c = concat ["(", show $ shellcheckLine c, ",", show $ shellcheckColumn c, ") ", shellcheckSeverity c, ": ", shellcheckComment c]
+
+severityToString s =
+    case s of
+        ErrorC -> "error"
+        WarningC -> "warning"
+        InfoC -> "info"
+        StyleC -> "style"
+
+formatNote (ParseNote pos severity text) = ShellCheckComment (sourceLine pos) (sourceColumn pos) (severityToString severity) text
diff --git a/Shpell/Simple.hs b/Shpell/Simple.hs
deleted file mode 100644
index 6c58085..0000000
--- a/Shpell/Simple.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-module Shpell.Simple (shpellCheck, ShpellComment, shpellLine, shpellColumn, shpellSeverity, shpellComment) where
-
-import Shpell.Parser
-import Shpell.Analytics
-import Data.Maybe
-import Text.Parsec.Pos
-import Data.List
-
-shpellCheck :: String -> [ShpellComment]
-shpellCheck script =
-    let (ParseResult result notes) = parseShell "-" script in
-        let allNotes = notes ++ (concat $ maybeToList $ do
-            (tree, map) <- result
-            let newMap = runAllAnalytics tree map
-            return $ notesFromMap newMap
-            )
-        in
-            map formatNote $ nub $ sortNotes allNotes
-
-data ShpellComment = ShpellComment { shpellLine :: Int, shpellColumn :: Int, shpellSeverity :: String, shpellComment :: String }
-
-
-instance Show ShpellComment where
-    show c = concat ["(", show $ shpellLine c, ",", show $ shpellColumn c, ") ", shpellSeverity c, ": ", shpellComment c]
-
-severityToString s =
-    case s of
-        ErrorC -> "error"
-        WarningC -> "warning"
-        InfoC -> "info"
-        StyleC -> "style"
-
-formatNote (ParseNote pos severity text) = ShpellComment (sourceLine pos) (sourceColumn pos) (severityToString severity) text
diff --git a/shpell.hs b/shellcheck.hs
similarity index 77%
rename from shpell.hs
rename to shellcheck.hs
index 2aeac49..dd22b3e 100644
--- a/shpell.hs
+++ b/shellcheck.hs
@@ -1,7 +1,7 @@
 import Control.Monad
 import GHC.Exts
 import GHC.IO.Device
-import Shpell.Simple
+import ShellCheck.Simple
 import System.Directory
 import System.Environment
 import System.Exit
@@ -33,25 +33,25 @@ doFile path colorFunc = do
 doInput filename contents colorFunc = do
     let fileLines = lines contents
     let lineCount = length fileLines
-    let comments = shpellCheck contents
-    let groups = groupWith shpellLine comments
+    let comments = shellcheckCheck contents
+    let groups = groupWith shellcheckLine comments
     if not $ null comments then do
         mapM_ (\x -> do
-            let lineNum = shpellLine (head x)
+            let lineNum = shellcheckLine (head x)
             let line = if lineNum < 1 || lineNum > lineCount
                             then ""
                             else fileLines !! (lineNum - 1)
             putStrLn ""
             putStrLn $ colorFunc "message" ("In " ++ filename ++" line " ++ (show $ lineNum) ++ ":")
             putStrLn (colorFunc "source" line)
-            mapM (\c -> putStrLn (colorFunc (shpellSeverity c) $ cuteIndent c)) x
+            mapM (\c -> putStrLn (colorFunc (shellcheckSeverity c) $ cuteIndent c)) x
             putStrLn ""
           ) groups
       else do
         putStrLn ("No comments for " ++ filename)
 
 cuteIndent comment =
-    (replicate ((shpellColumn comment) - 1) ' ') ++ "^-- " ++ (shpellComment comment)
+    (replicate ((shellcheckColumn comment) - 1) ' ') ++ "^-- " ++ (shellcheckComment comment)
 
 getColorFunc = do
     term <- hIsTerminalDevice stdout
@@ -61,8 +61,8 @@ main = do
     args <- getArgs
     colors <- getColorFunc
     if null args then do
-        hPutStrLn stderr "shpell -- bash/sh shell script static analysis tool"
-        hPutStrLn stderr "Usage: shpell filenames..."
+        hPutStrLn stderr "shellcheck -- bash/sh shell script static analysis tool"
+        hPutStrLn stderr "Usage: shellcheck filenames..."
         exitFailure
       else
         mapM (\f -> doFile f colors) args