diff --git a/cli/Main.hs b/cli/Main.hs
index c18fbdc..9651b75 100644
--- a/cli/Main.hs
+++ b/cli/Main.hs
@@ -23,6 +23,8 @@ module Main where
 import           Language.CQL
 import           System.Environment
 
+import Language.CQL.Program
+
 main :: IO ()
 main = do
   args <- getArgs
diff --git a/src/Language/CQL.hs b/src/Language/CQL.hs
index a35f5c3..cc6f55f 100644
--- a/src/Language/CQL.hs
+++ b/src/Language/CQL.hs
@@ -42,23 +42,23 @@ module Language.CQL where
 import           Control.Concurrent
 import           Control.DeepSeq
 import           Control.Exception
-import           Data.List          (nub)
-import qualified Data.Map.Strict    as Map
+import           Data.List              (nub)
+import qualified Data.Map.Strict        as Map
 import           Data.Maybe
 import           Data.Typeable
-import           Language.Common    as C
-import           Language.Graph
-import           Language.Instance  as I
-import           Language.Mapping   as M
-import           Language.Options
-import           Language.Parser    (parseCqlProgram)
-import           Language.Program   as P
-import           Language.Query     as Q
-import           Language.Schema    as S
-import           Language.Term      as Term
-import           Language.Transform as Tr
-import           Language.Typeside  as T
-import           Prelude            hiding (EQ, exp)
+import           Language.CQL.Common    as C
+import           Language.CQL.Graph
+import           Language.CQL.Instance  as I
+import           Language.CQL.Mapping   as M
+import           Language.CQL.Options
+import           Language.CQL.Parser    (parseCqlProgram)
+import           Language.CQL.Program   as P
+import           Language.CQL.Query     as Q
+import           Language.CQL.Schema    as S
+import           Language.CQL.Term      as Term
+import           Language.CQL.Transform as Tr
+import           Language.CQL.Typeside  as T
+import           Prelude                hiding (EQ, exp)
 import           System.IO.Unsafe
 
 -- | Times out a computation after @i@ microseconds.
diff --git a/src/Language/Common.hs b/src/Language/CQL/Common.hs
similarity index 99%
rename from src/Language/Common.hs
rename to src/Language/CQL/Common.hs
index 9e0c9a8..f46f1c5 100644
--- a/src/Language/Common.hs
+++ b/src/Language/CQL/Common.hs
@@ -38,7 +38,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Common where
+module Language.CQL.Common where
 
 import           Control.Arrow   (left)
 import           Data.Char
diff --git a/src/Language/Congruence.hs b/src/Language/CQL/Congruence.hs
similarity index 97%
rename from src/Language/Congruence.hs
rename to src/Language/CQL/Congruence.hs
index 371aa08..40eb89f 100644
--- a/src/Language/Congruence.hs
+++ b/src/Language/CQL/Congruence.hs
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE FlexibleContexts, OverloadedLists, OverloadedStrings, TupleSections #-}
-module Language.Congruence (decide, Term(Function)) where
+module Language.CQL.Congruence (decide, Term(Function)) where
 
 import           Prelude hiding (any)
 
@@ -35,7 +35,7 @@ import           Data.Foldable (traverse_)
 import           Data.Graph.Inductive (LNode)
 import           Data.Functor.Identity
 
-import           Language.Internal
+import           Language.CQL.Internal
 
 
 decide :: Ord t => [(Term t, Term t)] -> Term t -> Term t -> Bool
diff --git a/src/Language/Graph.hs b/src/Language/CQL/Graph.hs
similarity index 98%
rename from src/Language/Graph.hs
rename to src/Language/CQL/Graph.hs
index b1abf22..e495a31 100644
--- a/src/Language/Graph.hs
+++ b/src/Language/CQL/Graph.hs
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
 
-module Language.Graph where
+module Language.CQL.Graph where
 
 import           Prelude
 
diff --git a/src/Language/Instance.hs b/src/Language/CQL/Instance.hs
similarity index 98%
rename from src/Language/Instance.hs
rename to src/Language/CQL/Instance.hs
index 4f387e0..9e329ae 100644
--- a/src/Language/Instance.hs
+++ b/src/Language/CQL/Instance.hs
@@ -36,7 +36,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Instance where
+module Language.CQL.Instance where
 
 import           Control.DeepSeq
 import           Control.Monad
@@ -49,14 +49,14 @@ import           Data.Set              (Set)
 import qualified Data.Set              as Set
 import           Data.Typeable         hiding (typeOf)
 import           Data.Void
-import           Language.Common       (elem', intercalate, fromListAccum, mapl, section, sepTup, toMapSafely, Deps(..), Err, Kind(INSTANCE), MultiTyMap, TyMap, type (+))
-import           Language.Mapping      as Mapping
-import           Language.Options
-import           Language.Prover
-import           Language.Query
-import           Language.Schema       as Schema
-import           Language.Term         as Term
-import           Language.Typeside     as Typeside
+import           Language.CQL.Common   (elem', intercalate, fromListAccum, mapl, section, sepTup, toMapSafely, Deps(..), Err, Kind(INSTANCE), MultiTyMap, TyMap, type (+))
+import           Language.CQL.Mapping  as Mapping
+import           Language.CQL.Options
+import           Language.CQL.Prover
+import           Language.CQL.Query
+import           Language.CQL.Schema   as Schema
+import           Language.CQL.Term     as Term
+import           Language.CQL.Typeside as Typeside
 import           Prelude               hiding (EQ)
 import qualified Text.Tabular          as T
 import qualified Text.Tabular.AsciiArt as Ascii
diff --git a/src/Language/Internal.hs b/src/Language/CQL/Internal.hs
similarity index 99%
rename from src/Language/Internal.hs
rename to src/Language/CQL/Internal.hs
index f5c55bd..e15178d 100644
--- a/src/Language/Internal.hs
+++ b/src/Language/CQL/Internal.hs
@@ -26,7 +26,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
            , MultiParamTypeClasses
            , FunctionalDependencies
 #-}
-module Language.Internal where
+module Language.CQL.Internal where
 
 import           Prelude                       hiding (abs, any)
 
diff --git a/src/Language/Mapping.hs b/src/Language/CQL/Mapping.hs
similarity index 97%
rename from src/Language/Mapping.hs
rename to src/Language/CQL/Mapping.hs
index 505bc36..bff3c96 100644
--- a/src/Language/Mapping.hs
+++ b/src/Language/CQL/Mapping.hs
@@ -37,18 +37,18 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Mapping where
+module Language.CQL.Mapping where
 import           Control.DeepSeq
-import           Data.Map.Strict (Map)
-import           Data.Map.Strict as Map
+import           Data.Map.Strict     (Map)
+import           Data.Map.Strict     as Map
 import           Data.Maybe
-import qualified Data.Set        as Set
+import qualified Data.Set            as Set
 import           Data.Typeable
 import           Data.Void
-import           Language.Common
-import           Language.Schema as Schema
-import           Language.Term
-import           Prelude         hiding (EQ)
+import           Language.CQL.Common
+import           Language.CQL.Schema as Schema
+import           Language.CQL.Term
+import           Prelude             hiding (EQ)
 
 -- | Morphism of schemas.
 data Mapping var ty sym en fk att en' fk' att'
diff --git a/src/Language/Options.hs b/src/Language/CQL/Options.hs
similarity index 98%
rename from src/Language/Options.hs
rename to src/Language/CQL/Options.hs
index fb242db..d19a4cc 100644
--- a/src/Language/Options.hs
+++ b/src/Language/CQL/Options.hs
@@ -20,10 +20,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE EmptyDataDeriving #-}
 
-module Language.Options where
+module Language.CQL.Options where
 
 import           Data.Void
-import           Language.Common (Err, intercalate, lower)
+import           Language.CQL.Common (Err, intercalate, lower)
 import           Text.Read
 
 data Options = Options {
diff --git a/src/Language/Parser.hs b/src/Language/CQL/Parser.hs
similarity index 82%
rename from src/Language/Parser.hs
rename to src/Language/CQL/Parser.hs
index 97dfad4..4df4e0b 100644
--- a/src/Language/Parser.hs
+++ b/src/Language/CQL/Parser.hs
@@ -18,20 +18,20 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser where
+module Language.CQL.Parser where
 
 import           Data.List
-import           Data.Map                   as Map hiding ((\\))
+import           Data.Map                       as Map hiding ((\\))
 import           Data.Maybe
-import           Language.Common            as C
-import           Language.Parser.Instance   as I
-import           Language.Parser.LexerRules
-import           Language.Parser.Mapping    as M
-import           Language.Parser.Parser
-import           Language.Parser.Schema     as S'
-import           Language.Parser.Transform  as TT
-import           Language.Parser.Typeside   as T'
-import           Language.Program           as P
+import           Language.CQL.Common            as C
+import           Language.CQL.Parser.Instance   as I
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Mapping    as M
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Parser.Schema     as S'
+import           Language.CQL.Parser.Transform  as TT
+import           Language.CQL.Parser.Typeside   as T'
+import           Language.CQL.Program           as P
 import           Text.Megaparsec
 
 parseCqlProgram' :: Parser (String, Exp)
diff --git a/src/Language/Parser/Generator/Generator.hs b/src/Language/CQL/Parser/Generator/Generator.hs
similarity index 93%
rename from src/Language/Parser/Generator/Generator.hs
rename to src/Language/CQL/Parser/Generator/Generator.hs
index 79b648f..bad2e9a 100644
--- a/src/Language/Parser/Generator/Generator.hs
+++ b/src/Language/CQL/Parser/Generator/Generator.hs
@@ -18,14 +18,11 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Generator.Generator where
+module Language.CQL.Parser.Generator.Generator where
 
-import           Language.Parser.ReservedWords
-
--- QuickCheck
+import           Language.CQL.Parser.ReservedWords
 import           Test.QuickCheck.Gen
 
--- BASIC
 lowerCharGen :: Gen Char
 lowerCharGen = elements ['a' .. 'z']
 
diff --git a/src/Language/Parser/Instance.hs b/src/Language/CQL/Parser/Instance.hs
similarity index 88%
rename from src/Language/Parser/Instance.hs
rename to src/Language/CQL/Parser/Instance.hs
index 8c461f2..5e1bbd8 100644
--- a/src/Language/Parser/Instance.hs
+++ b/src/Language/CQL/Parser/Instance.hs
@@ -20,16 +20,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE TupleSections         #-}
 
-module Language.Parser.Instance where
-
-import           Language.Instance          as I
-import           Language.Mapping
-import           Language.Parser.LexerRules
-import           Language.Parser.Mapping    as M
-import           Language.Parser.Parser
-import           Language.Parser.Schema
-import           Language.Schema            as S
-import           Language.Term
+module Language.CQL.Parser.Instance where
+
+import           Language.CQL.Instance          as I
+import           Language.CQL.Mapping
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Mapping    as M
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Parser.Schema
+import           Language.CQL.Schema            as S
+import           Language.CQL.Term
 
 -- base
 import           Data.Maybe
diff --git a/src/Language/Parser/LexerRules.hs b/src/Language/CQL/Parser/LexerRules.hs
similarity index 97%
rename from src/Language/Parser/LexerRules.hs
rename to src/Language/CQL/Parser/LexerRules.hs
index dd27ba0..88ce8f7 100644
--- a/src/Language/Parser/LexerRules.hs
+++ b/src/Language/CQL/Parser/LexerRules.hs
@@ -18,7 +18,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.LexerRules where
+module Language.CQL.Parser.LexerRules where
 
 -- megaparsec
 import           Text.Megaparsec
diff --git a/src/Language/Parser/Mapping.hs b/src/Language/CQL/Parser/Mapping.hs
similarity index 91%
rename from src/Language/Parser/Mapping.hs
rename to src/Language/CQL/Parser/Mapping.hs
index 372c14a..d1f252f 100644
--- a/src/Language/Parser/Mapping.hs
+++ b/src/Language/CQL/Parser/Mapping.hs
@@ -18,13 +18,13 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Mapping where
+module Language.CQL.Parser.Mapping where
 
-import           Language.Mapping
-import           Language.Parser.LexerRules
-import           Language.Parser.Parser
-import           Language.Parser.Schema     hiding (attParser, fkParser)
-import           Language.Term
+import           Language.CQL.Mapping
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Parser.Schema     hiding (attParser, fkParser)
+import           Language.CQL.Term
 
 -- megaparsec
 import           Text.Megaparsec
diff --git a/src/Language/Parser/Parser.hs b/src/Language/CQL/Parser/Parser.hs
similarity index 95%
rename from src/Language/Parser/Parser.hs
rename to src/Language/CQL/Parser/Parser.hs
index 4f28973..0de0e25 100644
--- a/src/Language/Parser/Parser.hs
+++ b/src/Language/CQL/Parser/Parser.hs
@@ -18,10 +18,10 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Parser where
+module Language.CQL.Parser.Parser where
 
-import           Language.Parser.LexerRules
-import           Language.Parser.ReservedWords
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.ReservedWords
 
 -- base
 import           Data.Char
@@ -34,7 +34,7 @@ import qualified Text.Megaparsec.Char.Lexer    as L
 
 -- scientific
 import           Data.Scientific               (Scientific)
-import           Language.Term
+import           Language.CQL.Term
 
 rawTermParser :: Parser RawTerm
 rawTermParser =
diff --git a/src/Language/Parser/ReservedWords.hs b/src/Language/CQL/Parser/ReservedWords.hs
similarity index 98%
rename from src/Language/Parser/ReservedWords.hs
rename to src/Language/CQL/Parser/ReservedWords.hs
index 8bf0b3c..4d30f1e 100644
--- a/src/Language/Parser/ReservedWords.hs
+++ b/src/Language/CQL/Parser/ReservedWords.hs
@@ -18,7 +18,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.ReservedWords where
+module Language.CQL.Parser.ReservedWords where
 
 reservedWords :: [String]
 reservedWords =
diff --git a/src/Language/Parser/Schema.hs b/src/Language/CQL/Parser/Schema.hs
similarity index 90%
rename from src/Language/Parser/Schema.hs
rename to src/Language/CQL/Parser/Schema.hs
index c214041..24f5e20 100644
--- a/src/Language/Parser/Schema.hs
+++ b/src/Language/CQL/Parser/Schema.hs
@@ -21,14 +21,14 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 {-# LANGUAGE TupleSections #-}
 
-module Language.Parser.Schema where
-
-import           Language.Parser.LexerRules
-import           Language.Parser.Parser
-import           Language.Parser.Typeside
-import           Language.Schema            as X
-import           Language.Term
-import           Language.Typeside
+module Language.CQL.Parser.Schema where
+
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Parser.Typeside
+import           Language.CQL.Schema            as X
+import           Language.CQL.Term
+import           Language.CQL.Typeside
 
 -- base
 import           Data.Maybe
diff --git a/src/Language/Parser/Transform.hs b/src/Language/CQL/Parser/Transform.hs
similarity index 89%
rename from src/Language/Parser/Transform.hs
rename to src/Language/CQL/Parser/Transform.hs
index 33a6c23..4250a67 100644
--- a/src/Language/Parser/Transform.hs
+++ b/src/Language/CQL/Parser/Transform.hs
@@ -18,16 +18,16 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Transform (transExpParser) where
-
-import           Language.Instance
-import           Language.Mapping
-import           Language.Parser.Instance
-import           Language.Parser.LexerRules
-import           Language.Parser.Mapping
-import           Language.Parser.Parser
-import           Language.Term
-import           Language.Transform
+module Language.CQL.Parser.Transform (transExpParser) where
+
+import           Language.CQL.Instance
+import           Language.CQL.Mapping
+import           Language.CQL.Parser.Instance
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Mapping
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Term
+import           Language.CQL.Transform
 
 -- prelude
 import           Data.Maybe
diff --git a/src/Language/Parser/Typeside.hs b/src/Language/CQL/Parser/Typeside.hs
similarity index 93%
rename from src/Language/Parser/Typeside.hs
rename to src/Language/CQL/Parser/Typeside.hs
index c86c82b..44f56e0 100644
--- a/src/Language/Parser/Typeside.hs
+++ b/src/Language/CQL/Parser/Typeside.hs
@@ -21,12 +21,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 {-# LANGUAGE TupleSections #-}
 
-module Language.Parser.Typeside where
+module Language.CQL.Parser.Typeside where
 
-import           Language.Parser.LexerRules
-import           Language.Parser.Parser
-import           Language.Term
-import           Language.Typeside          as X
+import           Language.CQL.Parser.LexerRules
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Term
+import           Language.CQL.Typeside          as X
 
 -- base
 import           Data.Maybe
diff --git a/src/Language/Program.hs b/src/Language/CQL/Program.hs
similarity index 88%
rename from src/Language/Program.hs
rename to src/Language/CQL/Program.hs
index 7cbda57..8ea1b3b 100644
--- a/src/Language/Program.hs
+++ b/src/Language/CQL/Program.hs
@@ -36,19 +36,19 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Program where
+module Language.CQL.Program where
 
 import           Control.DeepSeq
-import           Data.Map.Strict    as Map
-import           Language.Common    (section, TyMap, Kind(..))
-import           Language.Instance  as I
-import           Language.Mapping   as M
-import           Language.Query     as Q
-import           Language.Schema    as S
-import           Language.Term      as Term
-import           Language.Transform as Tr
-import           Language.Typeside  as T
-import           Prelude            hiding (EQ)
+import           Data.Map.Strict        as Map
+import           Language.CQL.Common    (section, TyMap, Kind(..))
+import           Language.CQL.Instance  as I
+import           Language.CQL.Mapping   as M
+import           Language.CQL.Query     as Q
+import           Language.CQL.Schema    as S
+import           Language.CQL.Term      as Term
+import           Language.CQL.Transform as Tr
+import           Language.CQL.Typeside  as T
+import           Prelude                hiding (EQ)
 
 -- | Top level CQL expressions, untyped.
 data Exp
diff --git a/src/Language/Prover.hs b/src/Language/CQL/Prover.hs
similarity index 97%
rename from src/Language/Prover.hs
rename to src/Language/CQL/Prover.hs
index e4a5e29..f348740 100644
--- a/src/Language/Prover.hs
+++ b/src/Language/CQL/Prover.hs
@@ -35,7 +35,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Prover where
+module Language.CQL.Prover where
 
 import           Control.DeepSeq
 import           Data.List
@@ -46,20 +46,19 @@ import           Data.Rewriting.Rule         as R
 import           Data.Rewriting.Rules        as Rs
 import           Data.Rewriting.Term         as T
 import           Data.Set                    as Set
-import           Language.Common
-import           Language.Options            as O hiding (Prover)
-import           Language.Term               as S
+import           Language.CQL.Common
+import           Language.CQL.Options        as O hiding (Prover)
+import           Language.CQL.Term           as S
 import           Prelude                     hiding (EQ)
 import           Twee                        as Twee
 import           Twee.Base                   as TweeBase
 import           Twee.Equation               as TweeEq
 import qualified Twee.KBO                    as KBO
 import           Twee.Proof                  as TweeProof hiding (defaultConfig)
---import Debug.Trace
 import           Data.Map.Strict             as Map
 import           Data.Typeable
-import           Language.Congruence         as Cong
-import           Language.Internal           (Term)
+import           Language.CQL.Congruence     as Cong
+import           Language.CQL.Internal       (Term)
 
 
 
@@ -303,7 +302,7 @@ congProver col = if eqsAreGround col'
 convertCong
   :: (MultiTyMap '[Show, Ord, Typeable, NFData] '[var, ty, sym, en, fk, att, gen, sk])
   => S.Term var ty sym en fk att gen sk
-  -> Language.Internal.Term (Head ty sym en fk att gen sk)
+  -> Language.CQL.Internal.Term (Head ty sym en fk att gen sk)
 convertCong x = case x of
   S.Var _    -> error "Anomaly, please report.  Congruence conversion received variable."
   S.Gen g    -> Cong.Function (HGen g) []
diff --git a/src/Language/Query.hs b/src/Language/CQL/Query.hs
similarity index 93%
rename from src/Language/Query.hs
rename to src/Language/CQL/Query.hs
index 51edb6f..ff611a9 100644
--- a/src/Language/Query.hs
+++ b/src/Language/CQL/Query.hs
@@ -37,16 +37,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Query where
+module Language.CQL.Query where
 import           Control.DeepSeq
-import           Data.Map.Strict as Map
-import           Data.Set        as Set
+import           Data.Map.Strict      as Map
+import           Data.Set             as Set
 import           Data.Typeable
 import           Data.Void
-import           Language.Common
-import           Language.Schema
-import           Language.Term
-import           Prelude         hiding (EQ)
+import           Language.CQL.Common
+import           Language.CQL.Schema
+import           Language.CQL.Term
+import           Prelude              hiding (EQ)
 
 data Query var ty sym en fk att en' fk' att'
   = Query
diff --git a/src/Language/Schema.hs b/src/Language/CQL/Schema.hs
similarity index 96%
rename from src/Language/Schema.hs
rename to src/Language/CQL/Schema.hs
index beb6c75..5c43f6f 100644
--- a/src/Language/Schema.hs
+++ b/src/Language/CQL/Schema.hs
@@ -37,21 +37,21 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Schema where
+module Language.CQL.Schema where
 import           Control.DeepSeq
-import           Data.List         (nub)
-import           Data.Map.Strict   as Map
+import           Data.List             (nub)
+import           Data.Map.Strict       as Map
 import           Data.Maybe
-import           Data.Set          as Set
+import           Data.Set              as Set
 import           Data.Typeable
 import           Data.Void
-import           Language.Common
-import           Language.Options
-import           Language.Prover
-import           Language.Term
-import           Language.Typeside
--- cyclic import           Language.Instance
-import           Prelude           hiding (EQ)
+import           Language.CQL.Common
+import           Language.CQL.Options
+import           Language.CQL.Prover
+import           Language.CQL.Term
+import           Language.CQL.Typeside
+-- cyclic import           Language.CQL.Instance
+import           Prelude               hiding (EQ)
 
 
 data Schema var ty sym en fk att
diff --git a/src/Language/Term.hs b/src/Language/CQL/Term.hs
similarity index 99%
rename from src/Language/Term.hs
rename to src/Language/CQL/Term.hs
index 7826414..e59d364 100644
--- a/src/Language/Term.hs
+++ b/src/Language/CQL/Term.hs
@@ -37,7 +37,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Term where
+module Language.CQL.Term where
 
 import           Control.DeepSeq
 import           Data.Map.Merge.Strict
@@ -45,7 +45,7 @@ import           Data.Map.Strict       as Map hiding (foldr, size)
 import           Data.Maybe
 import           Data.Set              as Set hiding (foldr, size)
 import           Data.Void
-import           Language.Common
+import           Language.CQL.Common
 import           Prelude               hiding (EQ)
 
 data RawTerm = RawApp String [RawTerm]
diff --git a/src/Language/Transform.hs b/src/Language/CQL/Transform.hs
similarity index 96%
rename from src/Language/Transform.hs
rename to src/Language/CQL/Transform.hs
index ad5d5ac..93df80f 100644
--- a/src/Language/Transform.hs
+++ b/src/Language/CQL/Transform.hs
@@ -37,24 +37,23 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Transform where
+module Language.CQL.Transform where
 
 import           Control.DeepSeq
-import           Data.Map          (Map, mapWithKey)
-import qualified Data.Map.Strict   as Map
+import           Data.Map              (Map, mapWithKey)
+import qualified Data.Map.Strict       as Map
 import           Data.Maybe
-import qualified Data.Set          as Set
+import qualified Data.Set              as Set
 import           Data.Typeable
 import           Data.Void
-import           Language.Common
-import           Language.Instance as I
-import           Language.Mapping  as M
-import           Language.Options
-import           Language.Query
-import           Language.Schema   as S
-import           Language.Term
-import           Prelude           hiding (EQ)
-
+import           Language.CQL.Common
+import           Language.CQL.Instance as I
+import           Language.CQL.Mapping  as M
+import           Language.CQL.Options
+import           Language.CQL.Query
+import           Language.CQL.Schema   as S
+import           Language.CQL.Term
+import           Prelude               hiding (EQ)
 
 
 -- | Map from one 'Instance' to another of the same 'Schema'.
diff --git a/src/Language/Typeside.hs b/src/Language/CQL/Typeside.hs
similarity index 95%
rename from src/Language/Typeside.hs
rename to src/Language/CQL/Typeside.hs
index 4d1054f..922bda8 100644
--- a/src/Language/Typeside.hs
+++ b/src/Language/CQL/Typeside.hs
@@ -37,20 +37,20 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances  #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
-module Language.Typeside where
+module Language.CQL.Typeside where
 import           Control.DeepSeq
-import           Data.List        (nub)
-import           Data.Map.Strict  hiding (foldr)
-import qualified Data.Map.Strict  as Map
-import           Data.Set         (Set)
-import qualified Data.Set         as Set
+import           Data.List             (nub)
+import           Data.Map.Strict       hiding (foldr)
+import qualified Data.Map.Strict       as Map
+import           Data.Set              (Set)
+import qualified Data.Set              as Set
 import           Data.Typeable
 import           Data.Void
-import           Language.Common
-import           Language.Options
-import           Language.Prover
-import           Language.Term
-import           Prelude          hiding (EQ)
+import           Language.CQL.Common
+import           Language.CQL.Options
+import           Language.CQL.Prover
+import           Language.CQL.Term
+import           Prelude               hiding (EQ)
 
 -- | A user-defined kind for customization of data types.
 data Typeside var ty sym
diff --git a/test/CQLSpec.hs b/test/CQLSpec.hs
index 189fb94..384b42f 100644
--- a/test/CQLSpec.hs
+++ b/test/CQLSpec.hs
@@ -23,11 +23,11 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 module CQLSpec where
 
 import           Language.CQL
-import           Language.Schema
-import           Language.Term
-import           Language.Typeside
+import           Language.CQL.Schema
+import           Language.CQL.Term
+import           Language.CQL.Typeside
 
---base
+-- base
 import           Data.Either            (isRight)
 import           Data.Map.Strict        as Map
 import           Data.Set               as Set
diff --git a/test/Parser/ParserSpec.hs b/test/Parser/ParserSpec.hs
index 5c9d51c..c4e2c2a 100644
--- a/test/Parser/ParserSpec.hs
+++ b/test/Parser/ParserSpec.hs
@@ -22,20 +22,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 module Parser.ParserSpec where
 
-import           Language.Parser.Generator.Generator
-import           Language.Parser.Parser
-import           Language.Parser.ReservedWords
-
--- base
-import           Data.Either                         (isLeft)
-
--- hspec
+import           Language.CQL.Parser.Generator.Generator
+import           Language.CQL.Parser.Parser
+import           Language.CQL.Parser.ReservedWords
+import           Data.Either                             (isLeft)
 import           Test.Hspec
-
--- megaparsec
 import           Text.Megaparsec
-
--- QuickCheck
 import           Test.QuickCheck
 
 spec :: Spec
@@ -56,7 +48,7 @@ spec = do
       forAll ((:) <$> digitCharGen <*> listOf (oneof [idCharGen, digitCharGen])) $ \s ->
         isLeft $ parse identifier "" s
     specify
-      "does not parse a string starting with a not-allowed special character" $
+      "does not parse a string starting with an illegal special character" $
       forAll
         ((:) <$> (elements ['!', '"', '£', '%', '&', '/', '(', ')', '=', '?']) <*>
          listOf (oneof [idCharGen, digitCharGen])) $ \s ->