diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index a886c4f3..1fa68016 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -167,8 +167,8 @@ scaffold = do
         $(codegen "templates/default-layout.hamlet")
     writeFile' "templates/default-layout-wrapper.hamlet"
         $(codegen "templates/default-layout-wrapper.hamlet")
-    writeFile' "templates/boilerplate-layout.hamlet"
-        $(codegen "templates/boilerplate-layout.hamlet")
+    writeFile' "templates/boilerplate-wrapper.hamlet"
+        $(codegen "templates/boilerplate-wrapper.hamlet")
     writeFile' "templates/normalize.lucius"
         $(codegen "templates/normalize.lucius")
     writeFile' "templates/homepage.hamlet"
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 94ce8900..b86ef83c 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -39,7 +39,7 @@ extra-source-files:
   scaffold/templates/homepage.hamlet.cg
   scaffold/templates/default-layout.hamlet.cg
   scaffold/templates/default-layout-wrapper.hamlet.cg
-  scaffold/templates/boilerplate-layout.hamlet.cg
+  scaffold/templates/boilerplate-wrapper.hamlet.cg
   scaffold/deploy/Procfile.cg
   scaffold/main.hs.cg
   scaffold/Handler/Root.hs.cg