diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs
index f45c475a..4fbdfc73 100644
--- a/yesod/scaffold.hs
+++ b/yesod/scaffold.hs
@@ -150,14 +150,14 @@ scaffold = do
 
     writeFile' ("config/settings.yml") $(codegen "config/settings.yml")
     writeFile' ("main.hs") $(codegen "main.hs")
-    writeFile' (project ++ ".cabal") $ ifTiny $(codegen "mini/cabal") $(codegen "project.cabal")
+    writeFile' (project ++ ".cabal") $ ifTiny $(codegen "tiny/cabal") $(codegen "project.cabal")
     writeFile' ".ghci" $(codegen ".ghci")
     writeFile' "LICENSE" $(codegen "LICENSE")
-    writeFile' (sitearg ++ ".hs") $ ifTiny $(codegen "mini/sitearg.hs") $(codegen "sitearg.hs")
-    writeFile' "Controller.hs" $ ifTiny $(codegen "mini/Controller.hs") $(codegen "Controller.hs")
-    writeFile' "Handler/Root.hs" $ ifTiny $(codegen "mini/Handler/Root.hs") $(codegen "Handler/Root.hs")
+    writeFile' (sitearg ++ ".hs") $ ifTiny $(codegen "tiny/sitearg.hs") $(codegen "sitearg.hs")
+    writeFile' "Controller.hs" $ ifTiny $(codegen "tiny/Controller.hs") $(codegen "Controller.hs")
+    writeFile' "Handler/Root.hs" $ ifTiny $(codegen "tiny/Handler/Root.hs") $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
-    writeFile' "config/Settings.hs" $ ifTiny $(codegen "mini/config/Settings.hs") $(codegen "config/Settings.hs")
+    writeFile' "config/Settings.hs" $ ifTiny $(codegen "tiny/config/Settings.hs") $(codegen "config/Settings.hs")
     writeFile' "config/StaticFiles.hs" $(codegen "config/StaticFiles.hs")
     writeFile' "cassius/default-layout.cassius"
         $(codegen "cassius/default-layout.cassius")
@@ -167,8 +167,8 @@ scaffold = do
         $(codegen "hamlet/boilerplate-layout.hamlet")
     writeFile' "static/css/html5boilerplate.css"
         $(codegen "static/css/html5boilerplate.css")
-    writeFile' "hamlet/homepage.hamlet" $ ifTiny $(codegen "mini/hamlet/homepage.hamlet") $(codegen "hamlet/homepage.hamlet")
-    writeFile' "config/routes" $ ifTiny $(codegen "mini/config/routes") $(codegen "config/routes")
+    writeFile' "hamlet/homepage.hamlet" $ ifTiny $(codegen "tiny/hamlet/homepage.hamlet") $(codegen "hamlet/homepage.hamlet")
+    writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
     writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius")
     writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
diff --git a/yesod/scaffold/mini/Controller.hs.cg b/yesod/scaffold/tiny/Controller.hs.cg
similarity index 100%
rename from yesod/scaffold/mini/Controller.hs.cg
rename to yesod/scaffold/tiny/Controller.hs.cg
diff --git a/yesod/scaffold/mini/Handler/Root.hs.cg b/yesod/scaffold/tiny/Handler/Root.hs.cg
similarity index 100%
rename from yesod/scaffold/mini/Handler/Root.hs.cg
rename to yesod/scaffold/tiny/Handler/Root.hs.cg
diff --git a/yesod/scaffold/mini/cabal.cg b/yesod/scaffold/tiny/cabal.cg
similarity index 100%
rename from yesod/scaffold/mini/cabal.cg
rename to yesod/scaffold/tiny/cabal.cg
diff --git a/yesod/scaffold/mini/config/Settings.hs.cg b/yesod/scaffold/tiny/config/Settings.hs.cg
similarity index 100%
rename from yesod/scaffold/mini/config/Settings.hs.cg
rename to yesod/scaffold/tiny/config/Settings.hs.cg
diff --git a/yesod/scaffold/mini/config/routes.cg b/yesod/scaffold/tiny/config/routes.cg
similarity index 100%
rename from yesod/scaffold/mini/config/routes.cg
rename to yesod/scaffold/tiny/config/routes.cg
diff --git a/yesod/scaffold/mini/hamlet/homepage.hamlet.cg b/yesod/scaffold/tiny/hamlet/homepage.hamlet.cg
similarity index 100%
rename from yesod/scaffold/mini/hamlet/homepage.hamlet.cg
rename to yesod/scaffold/tiny/hamlet/homepage.hamlet.cg
diff --git a/yesod/scaffold/mini/sitearg.hs.cg b/yesod/scaffold/tiny/sitearg.hs.cg
similarity index 100%
rename from yesod/scaffold/mini/sitearg.hs.cg
rename to yesod/scaffold/tiny/sitearg.hs.cg
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 6b75169e..36fd0b77 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -23,13 +23,13 @@ extra-source-files:
   scaffold/sitearg.hs.cg
   scaffold/LICENSE.cg
   scaffold/mongoDBConnPool.cg
-  scaffold/mini/sitearg.hs.cg
-  scaffold/mini/cabal.cg
-  scaffold/mini/Controller.hs.cg
-  scaffold/mini/hamlet/homepage.hamlet.cg
-  scaffold/mini/Handler/Root.hs.cg
-  scaffold/mini/config/routes.cg
-  scaffold/mini/config/Settings.hs.cg
+  scaffold/tiny/sitearg.hs.cg
+  scaffold/tiny/cabal.cg
+  scaffold/tiny/Controller.hs.cg
+  scaffold/tiny/hamlet/homepage.hamlet.cg
+  scaffold/tiny/Handler/Root.hs.cg
+  scaffold/tiny/config/routes.cg
+  scaffold/tiny/config/Settings.hs.cg
   scaffold/static/css/html5boilerplate.css.cg
   scaffold/postgresqlConnPool.cg
   scaffold/sqliteConnPool.cg