diff --git a/lib/couchrest/helper/file_manager.rb b/lib/couchrest/helper/file_manager.rb
index 7bd4f39..e489493 100644
--- a/lib/couchrest/helper/file_manager.rb
+++ b/lib/couchrest/helper/file_manager.rb
@@ -124,18 +124,13 @@ module CouchRest
           libs << "\n"
         end
         if design_doc_parts.last =~ /-map/
-          designs[folder]["views"]["#{view_name}-map"] ||= {}
-
-          designs[folder]["views"]["#{view_name}-map"]["map"] = read(design_doc, libs)
-
-          designs[folder]["views"]["#{view_name}-reduce"] ||= {}
-          designs[folder]["views"]["#{view_name}-reduce"]["map"] = read(design_doc, libs)
+          designs[folder]["views"][view_name] ||= {}
+          designs[folder]["views"][view_name]["map"] = read(design_doc, libs)
         end
 
         if design_doc_parts.last =~ /-reduce/
-          designs[folder]["views"]["#{view_name}-reduce"] ||= {}
-
-          designs[folder]["views"]["#{view_name}-reduce"]["reduce"] = read(design_doc, libs)
+          designs[folder]["views"][view_name] ||= {}
+          designs[folder]["views"][view_name]["reduce"] = read(design_doc, libs)
         end
       end
 
diff --git a/spec/couchrest/helpers/file_manager_spec.rb b/spec/couchrest/helpers/file_manager_spec.rb
index ced4c5e..995cb7c 100644
--- a/spec/couchrest/helpers/file_manager_spec.rb
+++ b/spec/couchrest/helpers/file_manager_spec.rb
@@ -127,16 +127,16 @@ describe CouchRest::FileManager, "pushing views" do
     @design["views"].should_not be_nil
   end
   it "should push a map and reduce view" do
-    @design["views"]["test-map"].should_not be_nil
-    @design["views"]["test-reduce"].should_not be_nil
+    @design["views"]["test"]["map"].should_not be_nil
+    @design["views"]["test"]["reduce"].should_not be_nil
   end
   it "should push a map only view" do
-    @design["views"]["only-map"].should_not be_nil
-    @design["views"]["only-reduce"].should be_nil
+    @design["views"]["only"]["map"].should_not be_nil
+    @design["views"]["only"]["reduce"].should be_nil
   end
   it "should include library files" do
-    @design["views"]["only-map"]["map"].should include("globalLib")
-    @design["views"]["only-map"]["map"].should include("justThisView")
+    @design["views"]["only"]["map"].should include("globalLib")
+    @design["views"]["only"]["map"].should include("justThisView")
   end
   it "should not create extra design docs" do
     docs = @db.documents(:startkey => '_design', :endkey => '_design/ZZZZZZ')