diff --git a/lib/couchrest/helper/template-app/_attachments/index.html b/lib/couchrest/helper/app-template/_attachments/index.html
similarity index 100%
rename from lib/couchrest/helper/template-app/_attachments/index.html
rename to lib/couchrest/helper/app-template/_attachments/index.html
diff --git a/lib/couchrest/helper/template-app/foo/bar.txt b/lib/couchrest/helper/app-template/foo/bar.txt
similarity index 100%
rename from lib/couchrest/helper/template-app/foo/bar.txt
rename to lib/couchrest/helper/app-template/foo/bar.txt
diff --git a/lib/couchrest/helper/template-app/forms/example-form.js b/lib/couchrest/helper/app-template/forms/example-form.js
similarity index 100%
rename from lib/couchrest/helper/template-app/forms/example-form.js
rename to lib/couchrest/helper/app-template/forms/example-form.js
diff --git a/lib/couchrest/helper/template-app/lib/helpers/math.js b/lib/couchrest/helper/app-template/lib/helpers/math.js
similarity index 100%
rename from lib/couchrest/helper/template-app/lib/helpers/math.js
rename to lib/couchrest/helper/app-template/lib/helpers/math.js
diff --git a/lib/couchrest/helper/template-app/lib/helpers/template.js b/lib/couchrest/helper/app-template/lib/helpers/template.js
similarity index 100%
rename from lib/couchrest/helper/template-app/lib/helpers/template.js
rename to lib/couchrest/helper/app-template/lib/helpers/template.js
diff --git a/lib/couchrest/helper/template-app/lib/templates/example.html b/lib/couchrest/helper/app-template/lib/templates/example.html
similarity index 100%
rename from lib/couchrest/helper/template-app/lib/templates/example.html
rename to lib/couchrest/helper/app-template/lib/templates/example.html
diff --git a/lib/couchrest/helper/template-app/views/example/map.js b/lib/couchrest/helper/app-template/views/example/map.js
similarity index 100%
rename from lib/couchrest/helper/template-app/views/example/map.js
rename to lib/couchrest/helper/app-template/views/example/map.js
diff --git a/lib/couchrest/helper/template-app/views/example/reduce.js b/lib/couchrest/helper/app-template/views/example/reduce.js
similarity index 100%
rename from lib/couchrest/helper/template-app/views/example/reduce.js
rename to lib/couchrest/helper/app-template/views/example/reduce.js
diff --git a/lib/couchrest/helper/file_manager.rb b/lib/couchrest/helper/file_manager.rb
index 40275d0..2ec0e6e 100644
--- a/lib/couchrest/helper/file_manager.rb
+++ b/lib/couchrest/helper/file_manager.rb
@@ -20,7 +20,7 @@ module CouchRest
     # This is a class method because it doesn't depend on 
     # specifying a database.
     def self.generate_app(app_dir)      
-      templatedir = File.join(File.expand_path(File.dirname(__FILE__)), 'template-app')
+      templatedir = File.join(File.expand_path(File.dirname(__FILE__)), 'app-template')
       FileUtils.cp_r(templatedir, app_dir)
     end
      
diff --git a/spec/couchrest/helpers/file_manager_spec.rb b/spec/couchrest/helpers/file_manager_spec.rb
index 80c1582..4aa2c46 100644
--- a/spec/couchrest/helpers/file_manager_spec.rb
+++ b/spec/couchrest/helpers/file_manager_spec.rb
@@ -63,7 +63,7 @@ describe CouchRest::FileManager, "pushing an app" do
     @db.delete! rescue nil
     @db = @cr.create_db(TESTDB) rescue nil
     
-    @appdir = FIXTURE_PATH + '/couchapp/template-app'
+    @appdir = FIXTURE_PATH + '/generated-app'
 
     `rm -rf #{@appdir}`
     `mkdir -p #{@appdir}`
diff --git a/spec/fixtures/.gitignore b/spec/fixtures/.gitignore
index 6a85398..590be3b 100644
--- a/spec/fixtures/.gitignore
+++ b/spec/fixtures/.gitignore
@@ -1,2 +1,3 @@
 couchapp/*
-couchapp-test/*
\ No newline at end of file
+couchapp-test/*
+generated-app
\ No newline at end of file