diff --git a/Database/Persist/TH.hs b/Database/Persist/TH.hs
--- a/Database/Persist/TH.hs
+++ b/Database/Persist/TH.hs
@@ -429,18 +429,18 @@
 mkLensClauses t = do
     lens' <- [|lens|]
     getId <- [|entityKey|]
-    setId <- [|\(Entity _ val) key -> Entity key val|]
+    setId <- [|\(Entity _ value) key -> Entity key value|]
     getVal <- [|entityVal|]
     dot <- [|(.)|]
     keyName <- newName "key"
-    valName <- newName "val"
+    valName <- newName "value"
     xName <- newName "x"
     let idClause = Clause
             [ConP (mkName $ unpack $ unHaskellName (entityHaskell t) ++ "Id") []]
             (NormalB $ lens' `AppE` getId `AppE` setId)
             []
     if entitySum t
-        then return $ idClause : map (toSumClause lens' getVal dot keyName valName xName) (entityFields t)
+        then return $ idClause : map (toSumClause lens' keyName valName xName) (entityFields t)
         else return $ idClause : map (toClause lens' getVal dot keyName valName xName) (entityFields t)
   where
     toClause lens' getVal dot keyName valName xName f = Clause
@@ -458,12 +458,11 @@
                 (VarE valName)
                 [(fieldName, VarE xName)]
 
-    toSumClause lens' getVal dot keyName valName xName f = Clause
+    toSumClause lens' keyName valName xName f = Clause
         [ConP (mkName $ unpack $ unHaskellName (entityHaskell t) ++ upperFirst (unHaskellName $ fieldHaskell f)) []]
         (NormalB $ lens' `AppE` getter `AppE` setter)
         []
       where
-        fieldName = mkName $ unpack $ recName (unHaskellName $ entityHaskell t) (unHaskellName $ fieldHaskell f)
         getter = LamE
             [ ConP 'Entity [WildP, VarP valName]
             ] $ CaseE (VarE valName)
diff --git a/persistent-template.cabal b/persistent-template.cabal
--- a/persistent-template.cabal
+++ b/persistent-template.cabal
@@ -1,5 +1,5 @@
 name:            persistent-template
-version:         1.1.2.4
+version:         1.1.2.5
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>