diff --git a/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb b/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb
index fdfdd0454a..01f1a9ff86 100644
--- a/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb
+++ b/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb
@@ -12,7 +12,7 @@ module BatchUploadsControllerBehavior
     def create
       authenticate_user!
       create_update_job
-      flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
+      flash[:notice] = t('sufia.works.new.after_create_html', application_name: view_context.application_name)
       redirect_after_update
     end
 
diff --git a/app/controllers/concerns/sufia/works_controller_behavior.rb b/app/controllers/concerns/sufia/works_controller_behavior.rb
index 0e5f61b7a9..b4ea78331f 100644
--- a/app/controllers/concerns/sufia/works_controller_behavior.rb
+++ b/app/controllers/concerns/sufia/works_controller_behavior.rb
@@ -45,7 +45,7 @@ def attributes_for_actor
       def after_create_response
         respond_to do |wants|
           wants.html do
-            flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
+            flash[:notice] = t('sufia.works.new.after_create_html', application_name: view_context.application_name)
             redirect_to [main_app, curation_concern]
           end
           wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
diff --git a/app/views/curation_concerns/base/_form_metadata.html.erb b/app/views/curation_concerns/base/_form_metadata.html.erb
index 65755e126b..89fce99691 100644
--- a/app/views/curation_concerns/base/_form_metadata.html.erb
+++ b/app/views/curation_concerns/base/_form_metadata.html.erb
@@ -7,7 +7,7 @@
             <%= render_edit_field_partial(term, f: f) %>
           <% end %>
         </div>
-        <%= link_to t('sufia.generic_works.edit.additional_fields'),
+        <%= link_to t('sufia.works.edit.additional_fields'),
                     '#extended-terms',
                     class: 'btn btn-default',
                     data: { toggle: 'collapse' },
diff --git a/app/views/curation_concerns/base/_form_progress.html.erb b/app/views/curation_concerns/base/_form_progress.html.erb
index faa92558b7..ad61bd2f99 100644
--- a/app/views/curation_concerns/base/_form_progress.html.erb
+++ b/app/views/curation_concerns/base/_form_progress.html.erb
@@ -1,7 +1,7 @@
 <aside id="form-progress" class="form-progress panel panel-default">
   <div class="panel-heading">
 
-    <h2><%= t("sufia.#{controller_name}.progress.header") %></h2>
+    <h2><%= t("sufia.works.progress.header") %></h2>
   </div>
   <div class="list-group">
     <div class="list-group-item">
diff --git a/app/views/curation_concerns/base/_form_relationships.html.erb b/app/views/curation_concerns/base/_form_relationships.html.erb
index aa7d7c2835..ae1e8933b7 100644
--- a/app/views/curation_concerns/base/_form_relationships.html.erb
+++ b/app/views/curation_concerns/base/_form_relationships.html.erb
@@ -1,4 +1,4 @@
-<h3><%= t("sufia.#{controller_name}.#{action_name}.in_collections") %></h3>
+<h3><%= t("sufia.works.#{action_name}.in_collections") %></h3>
 <div id="collection-widget">
   <%= f.input :collection_ids, as: :select,
       collection: available_collections(nil),
diff --git a/app/views/curation_concerns/base/_guts4form.html.erb b/app/views/curation_concerns/base/_guts4form.html.erb
index 0bbb770112..c596d69965 100644
--- a/app/views/curation_concerns/base/_guts4form.html.erb
+++ b/app/views/curation_concerns/base/_guts4form.html.erb
@@ -12,7 +12,7 @@
           <li role="presentation">
         <% end %>
             <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-              <%= t("sufia.generic_works.edit.tab.#{tab}") %>
+              <%= t("sufia.works.edit.tab.#{tab}") %>
             </a>
           </li>
       <% end %>
diff --git a/app/views/curation_concerns/base/edit.html.erb b/app/views/curation_concerns/base/edit.html.erb
index 3cbfeed2de..496e2b3844 100644
--- a/app/views/curation_concerns/base/edit.html.erb
+++ b/app/views/curation_concerns/base/edit.html.erb
@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.#{controller_name}.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
 <% end %>
 
 <%= render 'form' %>
diff --git a/app/views/curation_concerns/base/new.html.erb b/app/views/curation_concerns/base/new.html.erb
index 3cbfeed2de..496e2b3844 100644
--- a/app/views/curation_concerns/base/new.html.erb
+++ b/app/views/curation_concerns/base/new.html.erb
@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.#{controller_name}.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
 <% end %>
 
 <%= render 'form' %>
diff --git a/app/views/curation_concerns/file_sets/media_display/_default.html.erb b/app/views/curation_concerns/file_sets/media_display/_default.html.erb
index eeb6f8fa3a..3fbf3da7cd 100644
--- a/app/views/curation_concerns/file_sets/media_display/_default.html.erb
+++ b/app/views/curation_concerns/file_sets/media_display/_default.html.erb
@@ -1,3 +1,3 @@
 <div class="no-preview">
-  <%= t('sufia.generic_works.show.no_preview') %>
+  <%= t('sufia.works.show.no_preview') %>
 </div>
diff --git a/config/locales/sufia.en.yml b/config/locales/sufia.en.yml
index d00b5aeec6..d56cee4aa3 100644
--- a/config/locales/sufia.en.yml
+++ b/config/locales/sufia.en.yml
@@ -205,7 +205,7 @@ en:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
         resource_type: "You may select multiple types to apply to all files"
-    generic_works:
+    works:
       new:
         header: Add New Work
         in_collections: This Work in Collections
diff --git a/sufia.gemspec b/sufia.gemspec
index 836d96859f..11511dbcc9 100644
--- a/sufia.gemspec
+++ b/sufia.gemspec
@@ -59,7 +59,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "factory_girl_rails", '~> 4.4'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "jasmine", '~> 2.3'
-  spec.add_development_dependency 'rubocop', '~> 0.40'
+  spec.add_development_dependency 'rubocop', '~> 0.40.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.5'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
 end