diff --git a/Language/SQL/SimpleSQL/Lexer.lhs b/Language/SQL/SimpleSQL/Lex.lhs
similarity index 99%
rename from Language/SQL/SimpleSQL/Lexer.lhs
rename to Language/SQL/SimpleSQL/Lex.lhs
index b4f9ba5..4a09d3d 100644
--- a/Language/SQL/SimpleSQL/Lexer.lhs
+++ b/Language/SQL/SimpleSQL/Lex.lhs
@@ -10,7 +10,7 @@ parsec
 
 > -- | This is the module contains a Lexer for SQL.
 > {-# LANGUAGE TupleSections #-}
-> module Language.SQL.SimpleSQL.Lexer
+> module Language.SQL.SimpleSQL.Lex
 >     (Token(..)
 >     ,lexSQL
 >     ,prettyToken
diff --git a/Language/SQL/SimpleSQL/Parser.lhs b/Language/SQL/SimpleSQL/Parse.lhs
similarity index 99%
rename from Language/SQL/SimpleSQL/Parser.lhs
rename to Language/SQL/SimpleSQL/Parse.lhs
index 347a6ce..e1018ef 100644
--- a/Language/SQL/SimpleSQL/Parser.lhs
+++ b/Language/SQL/SimpleSQL/Parse.lhs
@@ -176,7 +176,7 @@ fixing them in the syntax but leaving them till the semantic checking
 
 > {-# LANGUAGE TupleSections #-}
 > -- | This is the module with the parser functions.
-> module Language.SQL.SimpleSQL.Parser
+> module Language.SQL.SimpleSQL.Parse
 >     (parseQueryExpr
 >     ,parseValueExpr
 >     ,parseStatement
@@ -202,7 +202,7 @@ fixing them in the syntax but leaving them till the semantic checking
 > import Language.SQL.SimpleSQL.Syntax
 > import Language.SQL.SimpleSQL.Combinators
 > import Language.SQL.SimpleSQL.Errors
-> import qualified Language.SQL.SimpleSQL.Lexer as L
+> import qualified Language.SQL.SimpleSQL.Lex as L
 > import Data.Maybe
 > import Text.Parsec.String (GenParser)
 
diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal
index 25d760e..f05352f 100644
--- a/simple-sql-parser.cabal
+++ b/simple-sql-parser.cabal
@@ -32,8 +32,8 @@ Flag parserexe
 
 library
   exposed-modules:     Language.SQL.SimpleSQL.Pretty,
-                       Language.SQL.SimpleSQL.Parser,
-                       Language.SQL.SimpleSQL.Lexer,
+                       Language.SQL.SimpleSQL.Parse,
+                       Language.SQL.SimpleSQL.Lex,
                        Language.SQL.SimpleSQL.Syntax
   Other-Modules:       Language.SQL.SimpleSQL.Errors,
                        Language.SQL.SimpleSQL.Combinators
@@ -59,8 +59,8 @@ Test-Suite Tests
                        tasty-hunit >= 0.9 && < 0.10
 
   Other-Modules:       Language.SQL.SimpleSQL.Pretty,
-                       Language.SQL.SimpleSQL.Parser,
-                       Language.SQL.SimpleSQL.Lexer,
+                       Language.SQL.SimpleSQL.Parse,
+                       Language.SQL.SimpleSQL.Lex,
                        Language.SQL.SimpleSQL.Syntax,
                        Language.SQL.SimpleSQL.Errors,
                        Language.SQL.SimpleSQL.Combinators
diff --git a/tools/Language/SQL/SimpleSQL/LexerTests.lhs b/tools/Language/SQL/SimpleSQL/LexerTests.lhs
index c97187b..d91c808 100644
--- a/tools/Language/SQL/SimpleSQL/LexerTests.lhs
+++ b/tools/Language/SQL/SimpleSQL/LexerTests.lhs
@@ -5,7 +5,7 @@ Test for the lexer
 > module Language.SQL.SimpleSQL.LexerTests (lexerTests) where
 
 > import Language.SQL.SimpleSQL.TestTypes
-> import Language.SQL.SimpleSQL.Lexer (Token(..))
+> import Language.SQL.SimpleSQL.Lex (Token(..))
 > --import Debug.Trace
 
 > lexerTable :: [(String,[Token])]
diff --git a/tools/Language/SQL/SimpleSQL/TestTypes.lhs b/tools/Language/SQL/SimpleSQL/TestTypes.lhs
index 09de915..010c63b 100644
--- a/tools/Language/SQL/SimpleSQL/TestTypes.lhs
+++ b/tools/Language/SQL/SimpleSQL/TestTypes.lhs
@@ -7,7 +7,7 @@ Tests.lhs module for the 'interpreter'.
 >     ,Dialect(..)) where
 
 > import Language.SQL.SimpleSQL.Syntax
-> import Language.SQL.SimpleSQL.Lexer (Token)
+> import Language.SQL.SimpleSQL.Lex (Token)
 
 TODO: maybe make the dialect args into [dialect], then each test
 checks all the dialects mentioned work, and all the dialects not
diff --git a/tools/Language/SQL/SimpleSQL/Tests.lhs b/tools/Language/SQL/SimpleSQL/Tests.lhs
index bf45c23..ec32437 100644
--- a/tools/Language/SQL/SimpleSQL/Tests.lhs
+++ b/tools/Language/SQL/SimpleSQL/Tests.lhs
@@ -14,8 +14,8 @@ test data to the Test.Framework tests.
 
 > --import Language.SQL.SimpleSQL.Syntax
 > import Language.SQL.SimpleSQL.Pretty
-> import Language.SQL.SimpleSQL.Parser
-> import Language.SQL.SimpleSQL.Lexer
+> import Language.SQL.SimpleSQL.Parse
+> import Language.SQL.SimpleSQL.Lex
 
 > import Language.SQL.SimpleSQL.TestTypes