diff --git a/Data/Lens/Template.hs b/Data/Lens/Template.hs
--- a/Data/Lens/Template.hs
+++ b/Data/Lens/Template.hs
@@ -103,9 +103,9 @@
         liftM (concat . catMaybes) $ mapM (\ (name,_,ftype) -> makeAccFromName name params ftype) vars
 
     transformName :: Name -> Maybe Name
-    transformName (Name occ f) = do
+    transformName (Name occ _) = do
         n <- namer (occString occ)
-        return $ Name (mkOccName n) f
+        return $ Name (mkOccName n) NameS
 
     makeAccFromName :: Name -> [TyVarBndr] -> Type -> Q (Maybe [Dec])
     makeAccFromName name params ftype =
@@ -134,6 +134,7 @@
 
 #endif
 
+errmsg :: Show a => a -> [Char]
 errmsg t = "Cannot derive accessors for name " ++ show t ++ " because"
          ++ "\n it is not a type declared with 'data' or 'newtype'"
          ++ "\n Did you remember to double-tick the type as in"
diff --git a/data-lens-template.cabal b/data-lens-template.cabal
--- a/data-lens-template.cabal
+++ b/data-lens-template.cabal
@@ -1,19 +1,19 @@
 name:          data-lens-template
-version:       2.1.5
+version:       2.1.6
 license:       BSD3
 license-file:  LICENSE
 author:        Joel Burget <joelburget@gmail.com>
-maintainer:    Edward Kmett <ekmett@gmail.com>
+maintainer:    Russell O'Connor <roconnor@theorem.ca>
 category:      Data
 synopsis:      Utilities for Data.Lens
 description:   Automatically derive @Lens@es for your data type for use with @Data.Lens@. Note: the code is derived from data-accessor-template <http://hackage.haskell.org/package/data-accessor-template> by Luke Palmer and Henning Thielemann.
 build-type:    Simple
-homepage:      http://github.com/ekmett/data-lens-template/
+homepage:      http://github.com/roconnor/data-lens-template/
 cabal-version: >= 1.6
 
 source-repository head
   type    : git
-  location: git@github.com:ekmett/data-lens-template.git
+  location: git@github.com:roconnor/data-lens-template.git
 
 library
   extensions:       CPP
@@ -22,7 +22,7 @@
   build-depends:
     data-lens        >= 2.0 && < 2.11,
     base             >= 1.0 && < 5,
-    template-haskell >= 2.4 && < 2.8
+    template-haskell >= 2.4 && < 2.9
 
   exposed-modules:
     Data.Lens.Template