diff --git a/opentheory-primitive.cabal b/opentheory-primitive.cabal
--- a/opentheory-primitive.cabal
+++ b/opentheory-primitive.cabal
@@ -1,20 +1,20 @@
-Name: opentheory-primitive
-Version: 1.0
-Category: Formal Methods
-Synopsis: Haskell primitives used by OpenTheory packages
-License: MIT
-License-file: LICENSE
-Cabal-version: >= 1.8.0.6
-Build-type: Simple
-Author: Joe Hurd <joe@gilith.com>
-Maintainer: Joe Hurd <joe@gilith.com>
-Description:
+name: opentheory-primitive
+version: 1.1
+category: Formal Methods
+synopsis: Haskell primitives used by OpenTheory packages
+license: MIT
+license-file: LICENSE
+cabal-version: >= 1.8.0.6
+build-type: Simple
+author: Joe Hurd <joe@gilith.com>
+maintainer: Joe Hurd <joe@gilith.com>
+description:
   The types and values defined in this package extend those in the
   Prelude to provide the core execution platform assumed by Haskell
   packages exported from formally verified OpenTheory packages.
 
 Library
-  Build-depends:
+  build-depends:
     base >= 4.0 && < 5.0,
     random >= 1.0.1.1 && < 2.0,
     QuickCheck >= 2.4.0.1 && < 3.0
@@ -23,7 +23,7 @@
 
   ghc-options: -Wall
 
-  Exposed-modules:
+  exposed-modules:
     OpenTheory.Primitive.Byte
     OpenTheory.Primitive.Natural
     OpenTheory.Primitive.Random
@@ -31,7 +31,7 @@
     OpenTheory.Primitive.Test
 
 Executable opentheory-primitive-test
-  Build-depends:
+  build-depends:
     base >= 4.0 && < 5.0,
     random >= 1.0.1.1 && < 2,
     QuickCheck >= 2.4.0.1 && < 3.0
@@ -40,4 +40,4 @@
 
   ghc-options: -Wall
 
-  Main-is: Test.hs
+  main-is: Test.hs
diff --git a/src/OpenTheory/Primitive/Byte.hs b/src/OpenTheory/Primitive/Byte.hs
--- a/src/OpenTheory/Primitive/Byte.hs
+++ b/src/OpenTheory/Primitive/Byte.hs
@@ -1,13 +1,11 @@
 {- |
-Module: $Header$
-Description: Byte primitive functions
-License: MIT
-
-Maintainer: Joe Hurd <joe@gilith.com>
-Stability: provisional
-Portability: portable
+module: $Header$
+description: Primitive byte functions
+license: MIT
 
-Byte primitive functions
+maintainer: Joe Hurd <joe@gilith.com>
+stability: provisional
+portability: portable
 -}
 module OpenTheory.Primitive.Byte
   ( Byte,
diff --git a/src/OpenTheory/Primitive/Natural.hs b/src/OpenTheory/Primitive/Natural.hs
--- a/src/OpenTheory/Primitive/Natural.hs
+++ b/src/OpenTheory/Primitive/Natural.hs
@@ -1,13 +1,11 @@
 {- |
-Module: $Header$
-Description: A natural number type
-License: MIT
-
-Maintainer: Joe Hurd <joe@gilith.com>
-Stability: provisional
-Portability: portable
+module: $Header$
+description: Primitive natural number functions
+license: MIT
 
-A natural number type
+maintainer: Joe Hurd <joe@gilith.com>
+stability: provisional
+portability: portable
 -}
 module OpenTheory.Primitive.Natural
   ( Natural )
diff --git a/src/OpenTheory/Primitive/Random.hs b/src/OpenTheory/Primitive/Random.hs
--- a/src/OpenTheory/Primitive/Random.hs
+++ b/src/OpenTheory/Primitive/Random.hs
@@ -1,13 +1,11 @@
 {- |
-Module: $Header$
-Description: Random stream primitives
-License: MIT
-
-Maintainer: Joe Hurd <joe@gilith.com>
-Stability: provisional
-Portability: portable
+module: $Header$
+description: Primitive random bit-stream functions
+license: MIT
 
-Random stream primitives
+maintainer: Joe Hurd <joe@gilith.com>
+stability: provisional
+portability: portable
 -}
 module OpenTheory.Primitive.Random
   ( Random,
diff --git a/src/OpenTheory/Primitive/Test.hs b/src/OpenTheory/Primitive/Test.hs
--- a/src/OpenTheory/Primitive/Test.hs
+++ b/src/OpenTheory/Primitive/Test.hs
@@ -1,13 +1,11 @@
 {- |
-Module: $Header$
-Description: OpenTheory QuickCheck interface
-License: MIT
-
-Maintainer: Joe Hurd <joe@gilith.com>
-Stability: provisional
-Portability: portable
+module: $Header$
+description: OpenTheory QuickCheck interface
+license: MIT
 
-OpenTheory QuickCheck interface
+maintainer: Joe Hurd <joe@gilith.com>
+stability: provisional
+portability: portable
 -}
 module OpenTheory.Primitive.Test
   ( check )
diff --git a/src/OpenTheory/Primitive/Word16.hs b/src/OpenTheory/Primitive/Word16.hs
--- a/src/OpenTheory/Primitive/Word16.hs
+++ b/src/OpenTheory/Primitive/Word16.hs
@@ -1,13 +1,11 @@
 {- |
-Module: $Header$
-Description: Word16 primitive functions
-License: MIT
-
-Maintainer: Joe Hurd <joe@gilith.com>
-Stability: provisional
-Portability: portable
+module: $Header$
+description: Primitive 16-bit word functions
+license: MIT
 
-Word16 primitive functions
+maintainer: Joe Hurd <joe@gilith.com>
+stability: provisional
+portability: portable
 -}
 module OpenTheory.Primitive.Word16
   ( Word16,