diff --git a/app/controllers/concerns/curation_concerns/curation_concern_controller.rb b/app/controllers/concerns/curation_concerns/curation_concern_controller.rb
index 6608c89ce..8e61488a3 100644
--- a/app/controllers/concerns/curation_concerns/curation_concern_controller.rb
+++ b/app/controllers/concerns/curation_concerns/curation_concern_controller.rb
@@ -72,7 +72,7 @@ def show_presenter
   # Gives the class of the form. Override this if you want
   # to use a different form.
   def form_class
-    CurationConcerns.const_get("#{self.class.curation_concern_type}Form")
+    CurationConcerns.const_get("#{self.class.curation_concern_type.to_s.demodulize}Form")
   end
 
   def edit
@@ -120,8 +120,8 @@ def _prefixes
 
     def after_create_response
       respond_to do |wants|
-        wants.html { redirect_to [main_app, :curation_concerns, curation_concern] }
-        wants.json { render :show, status: :created, location: polymorphic_path([main_app, :curation_concerns, curation_concern]) }
+        wants.html { redirect_to [main_app, curation_concern] }
+        wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
       end
     end
 
@@ -131,8 +131,8 @@ def after_update_response
         redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
       else
         respond_to do |wants|
-          wants.html { redirect_to [main_app, :curation_concerns, curation_concern] }
-          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, :curation_concerns, curation_concern]) }
+          wants.html { redirect_to [main_app, curation_concern] }
+          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
         end
       end
     end
@@ -150,6 +150,6 @@ def attributes_for_actor
     end
 
     def hash_key_for_curation_concern
-      self.class.curation_concern_type.name.underscore.to_sym
+      self.class.curation_concern_type.model_name.param_key
     end
 end
diff --git a/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb b/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb
index 869fd1dff..b75375b2c 100644
--- a/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb
+++ b/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb
@@ -78,7 +78,7 @@ def show_presenter
 
     def destroy
       actor.destroy
-      redirect_to [main_app, :curation_concerns, @file_set.in_works.first], notice: 'The file has been deleted.'
+      redirect_to [main_app, @file_set.in_works.first], notice: 'The file has been deleted.'
     end
 
     # routed to /files/:id (PUT)
@@ -183,7 +183,7 @@ def process_file(file)
               if request.xhr?
                 render 'jq_upload', formats: 'json', content_type: 'text/html'
               else
-                redirect_to [main_app, :curation_concerns, @file_set.in_works.first]
+                redirect_to [main_app, @file_set.in_works.first]
               end
             end
             format.json do
diff --git a/app/controllers/curation_concerns/permissions_controller.rb b/app/controllers/curation_concerns/permissions_controller.rb
index ebe8319df..889eadaeb 100644
--- a/app/controllers/curation_concerns/permissions_controller.rb
+++ b/app/controllers/curation_concerns/permissions_controller.rb
@@ -9,7 +9,7 @@ def confirm
   def copy
     VisibilityCopyJob.perform_later(curation_concern.id)
     flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
-    redirect_to polymorphic_path([main_app, :curation_concerns, curation_concern]), notice: flash_message
+    redirect_to [main_app, curation_concern], notice: flash_message
   end
 
   def curation_concern
diff --git a/app/helpers/curation_concerns/file_set_helper.rb b/app/helpers/curation_concerns/file_set_helper.rb
index f7bd50de1..c4c6cea9b 100644
--- a/app/helpers/curation_concerns/file_set_helper.rb
+++ b/app/helpers/curation_concerns/file_set_helper.rb
@@ -3,7 +3,7 @@ def parent_path(parent)
     if parent.is_a?(Collection)
       main_app.collection_path(parent)
     else
-      polymorphic_path([main_app, :curation_concerns, parent])
+      polymorphic_path([main_app, parent])
     end
   end
 
diff --git a/app/helpers/curation_concerns/url_helper.rb b/app/helpers/curation_concerns/url_helper.rb
index d2bfd9853..e907139bf 100644
--- a/app/helpers/curation_concerns/url_helper.rb
+++ b/app/helpers/curation_concerns/url_helper.rb
@@ -5,8 +5,11 @@ module UrlHelper
     def url_for_document(doc, _options = {})
       if doc.collection?
         doc
-      else
+      elsif doc.file_set?
+        # TODO: Namespace FileSet?
         polymorphic_path([main_app, :curation_concerns, doc])
+      else
+        polymorphic_path([main_app, doc])
       end
     end
 
@@ -21,7 +24,7 @@ def track_file_set_path(*args)
     # generated new GenericWork models get registered as curation concerns and need a
     # track_model_path to render Blacklight-related views
     CurationConcerns.config.registered_curation_concern_types.each do |concern|
-      define_method("track_#{concern.underscore}_path") { |*args| main_app.track_solr_document_path(*args) }
+      define_method("track_#{concern.constantize.model_name.singular_route_key}_path") { |*args| main_app.track_solr_document_path(*args) }
     end
   end
 end
diff --git a/app/presenters/curation_concerns/file_set_presenter.rb b/app/presenters/curation_concerns/file_set_presenter.rb
index c25ed880d..aae33c058 100644
--- a/app/presenters/curation_concerns/file_set_presenter.rb
+++ b/app/presenters/curation_concerns/file_set_presenter.rb
@@ -12,7 +12,7 @@ def initialize(solr_document, current_ability)
     end
 
     # CurationConcern methods
-    delegate :stringify_keys, :human_readable_type, :collection?, :image?, :video?,
+    delegate :stringify_keys, :human_readable_type, :collection?, :file_set?, :image?, :video?,
              :audio?, :pdf?, :office_document?, :representative_id, :to_s, to: :solr_document
 
     # Methods used by blacklight helpers
diff --git a/app/views/catalog/_action_menu_partials/_default.html.erb b/app/views/catalog/_action_menu_partials/_default.html.erb
index dbfaed676..fb67aa10f 100644
--- a/app/views/catalog/_action_menu_partials/_default.html.erb
+++ b/app/views/catalog/_action_menu_partials/_default.html.erb
@@ -4,14 +4,14 @@
     <ul class="dropdown-menu">
       <% if can? :edit, document %>
         <li>
-          <%= link_to [:edit, :curation_concerns, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
+          <%= link_to [:edit, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
           <% end %>
         </li>
         <li>
           <% if @collection || (@presenter and @presenter.collection?) # We're on the view page for @collection. -%>
             <%= link_to_remove_from_collection(document) %>
           <% else %>
-            <%= link_to [:curation_concerns, document], class: 'itemicon itemtrash',
+            <%= link_to document, class: 'itemicon itemtrash',
                         title: "Delete #{document.human_readable_type}", method: :delete,
                         data: {
                           confirm: "Deleting a #{document.human_readable_type} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this #{document.human_readable_type} from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
diff --git a/app/views/curation_concerns/base/_form.html.erb b/app/views/curation_concerns/base/_form.html.erb
index c89673897..4c6d32dfa 100644
--- a/app/views/curation_concerns/base/_form.html.erb
+++ b/app/views/curation_concerns/base/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for [main_app, :curation_concerns, curation_concern],
+<%= simple_form_for [main_app, curation_concern],
                     wrapper_mappings: { multifile: :horizontal_file_input } do |f| %>
   <% if f.error_notification -%>
     <div class="alert alert-danger fade in">
@@ -16,7 +16,7 @@
       <%- if curation_concern.new_record? -%>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>
       <%- else -%>
-        <%= link_to 'Cancel', polymorphic_path([main_app, :curation_concerns, curation_concern]), class: 'btn btn-link' %>
+        <%= link_to 'Cancel', polymorphic_path([main_app, curation_concern]), class: 'btn btn-link' %>
       <%- end -%>
     </div>
   </div>
diff --git a/app/views/curation_concerns/base/_show_actions.html.erb b/app/views/curation_concerns/base/_show_actions.html.erb
index 6aeb36a6f..0bb84cabc 100644
--- a/app/views/curation_concerns/base/_show_actions.html.erb
+++ b/app/views/curation_concerns/base/_show_actions.html.erb
@@ -1,9 +1,9 @@
 <% if collector || editor %>
   <div class="form-actions">
     <% if editor %>
-      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default' %>
+      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default' %>
       <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
-      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, :curation_concerns, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
+      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/curation_concerns/file_sets/upload/_alerts.html.erb b/app/views/curation_concerns/file_sets/upload/_alerts.html.erb
index 5150c97a6..120830a87 100644
--- a/app/views/curation_concerns/file_sets/upload/_alerts.html.erb
+++ b/app/views/curation_concerns/file_sets/upload/_alerts.html.erb
@@ -2,17 +2,17 @@
 <div class="alert alert-info hide" id="success">
   You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
   <p>
-  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, @presenter]), class: 'btn' %>
   </p>
 </div>
 
 <div class="alert hide" id="fail">
-  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', edit_polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', edit_polymorphic_path([main_app, @presenter]) %>
 </div>
 
 <div class="alert hide" id="partial_fail">
   One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, @presenter]), class: 'btn' %>
 </div>
 
 <div class="alert hide" id="errmsg"> </div>
diff --git a/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb b/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb
index fe83369d2..ceae7ff0f 100644
--- a/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb
+++ b/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb
@@ -1,6 +1,6 @@
 <div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
   <%-# Script redirects here once the uploads are complete %>
-  <%= polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+  <%= polymorphic_path([main_app, @presenter]) %>
 </div>
 
 <!-- The template to display files available for upload -->
diff --git a/app/views/curation_concerns/permissions/confirm.html.erb b/app/views/curation_concerns/permissions/confirm.html.erb
index ba35324fa..006d6f9b3 100644
--- a/app/views/curation_concerns/permissions/confirm.html.erb
+++ b/app/views/curation_concerns/permissions/confirm.html.erb
@@ -16,6 +16,6 @@
   </div>
   <div class="form-actions panel-footer">
     <%= button_to "Yes please.", main_app.copy_curation_concerns_permission_path(curation_concern), class: 'btn btn-primary' %>
-    <%= link_to "No. I'll update it manually.", polymorphic_path([main_app, :curation_concerns, curation_concern]), class: 'btn' %>
+    <%= link_to "No. I'll update it manually.", polymorphic_path([main_app, curation_concern]), class: 'btn' %>
   </div>
 </div>
diff --git a/app/views/embargoes/edit.html.erb b/app/views/embargoes/edit.html.erb
index ef6d9e40d..fb99cb53d 100644
--- a/app/views/embargoes/edit.html.erb
+++ b/app/views/embargoes/edit.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Current Embargo</h2>
-<%= simple_form_for [:curation_concerns, curation_concern] do |f| %>
+<%= simple_form_for [main_app, curation_concern] do |f| %>
   <fieldset id="set-access-controls">
     <section class="help-block">
       <p>
@@ -25,12 +25,12 @@
     <div class="col-md-12 form-actions">
       <% if curation_concern.embargo_release_date %>
         <%= f.submit "Update Embargo", class: 'btn btn-primary' %>
-        <%= link_to "Deactivate Embargo", embargo_path(curation_concern), :method => :delete, class: 'btn btn-danger' %>
+        <%= link_to "Deactivate Embargo", embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
       <% else %>
         <%= f.submit "Apply Embargo", class: 'btn btn-primary' %>
       <% end %>
       <%= link_to 'Cancel and manage all embargoes', embargoes_path, class: 'btn btn-default' %>
-      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concerns, curation_concern]), class: 'btn btn-default' %>
+      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", [:edit, curation_concern], class: 'btn btn-default' %>
     </div>
   </div>
 <% end %>
@@ -39,5 +39,5 @@
 <% if curation_concern.embargo_history.empty? %>
   This <%= curation_concern.human_readable_type %> has never had embargoes applied to it.
 <% else %>
-  <%= render partial:"embargo_history" %>
+  <%= render partial: "embargo_history" %>
 <% end %>
diff --git a/app/views/leases/edit.html.erb b/app/views/leases/edit.html.erb
index fe897f0c3..f9a13235c 100644
--- a/app/views/leases/edit.html.erb
+++ b/app/views/leases/edit.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Current Lease</h2>
-<%= simple_form_for [:curation_concerns, curation_concern] do |f| %>
+<%= simple_form_for curation_concern do |f| %>
   <fieldset id="set-access-controls">
     <section class="help-block">
       <p>
@@ -25,12 +25,12 @@
     <div class="col-md-12 form-actions">
       <% if curation_concern.lease_expiration_date %>
         <%= f.submit "Update Lease", class: 'btn btn-primary' %>
-        <%= link_to "Deactivate Lease", lease_path(curation_concern), :method => :delete, class: 'btn btn-danger' %>
+        <%= link_to "Deactivate Lease", lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
       <% else %>
         <%= f.submit "Apply Lease", class: 'btn btn-primary' %>
       <% end %>
       <%= link_to 'Cancel and manage all leases', leases_path, class: 'btn btn-default' %>
-      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", edit_polymorphic_path([:curation_concerns, curation_concern]), class: 'btn btn-default' %>
+      <%= link_to "Return to editing this #{curation_concern.human_readable_type}", [:edit, curation_concern], class: 'btn btn-default' %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/shared/_add_works.html.erb b/app/views/shared/_add_works.html.erb
index cb52f9873..aa12ce78c 100644
--- a/app/views/shared/_add_works.html.erb
+++ b/app/views/shared/_add_works.html.erb
@@ -3,7 +3,7 @@
             <% CurationConcerns::QuickClassificationQuery.each_for_context(current_user) do |concern| %>
               <li><%= link_to(
                     "New #{concern.human_readable_type}",
-                    main_app.new_polymorphic_path([:curation_concerns, concern]),
+                    new_polymorphic_path([main_app, concern]),
                     class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
                     role: 'menuitem'
                   ) %>
diff --git a/curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb b/curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb
index 991c041e5..6dc21937e 100644
--- a/curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb
+++ b/curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb
@@ -31,6 +31,10 @@ def collection?
       hydra_model == 'Collection'
     end
 
+    def file_set?
+      hydra_model == 'FileSet'
+    end
+
     # Method to return the ActiveFedora model
     def hydra_model
       self[Solrizer.solr_name('active_fedora_model', Solrizer::Descriptor.new(:string, :stored, :indexed))]
diff --git a/curation_concerns-models/app/models/concerns/curation_concerns/work_behavior.rb b/curation_concerns-models/app/models/concerns/curation_concerns/work_behavior.rb
index 020c5532c..d21c024f3 100644
--- a/curation_concerns-models/app/models/concerns/curation_concerns/work_behavior.rb
+++ b/curation_concerns-models/app/models/concerns/curation_concerns/work_behavior.rb
@@ -33,11 +33,6 @@ def to_s
     end
   end
 
-  # Returns a string identifying the path associated with the object. ActionPack uses this to find a suitable partial to represent the object.
-  def to_partial_path
-    "curation_concerns/#{super}"
-  end
-
   def can_be_member_of_collection?(_collection)
     true
   end
diff --git a/curation_concerns-models/lib/curation_concerns/configuration.rb b/curation_concerns-models/lib/curation_concerns/configuration.rb
index f588bb431..ef7df311b 100644
--- a/curation_concerns-models/lib/curation_concerns/configuration.rb
+++ b/curation_concerns-models/lib/curation_concerns/configuration.rb
@@ -146,7 +146,7 @@ def curation_concerns
     private
 
       def normalize_concern_name(c)
-        c.to_s.camelize
+        "CurationConcerns::#{c.to_s.camelize}"
       end
   end
 
diff --git a/lib/curation_concerns/engine.rb b/lib/curation_concerns/engine.rb
index 140abdce0..1fa15442c 100644
--- a/lib/curation_concerns/engine.rb
+++ b/lib/curation_concerns/engine.rb
@@ -7,6 +7,11 @@
 require 'qa'
 
 module CurationConcerns
+  # Ensures that routes to curation_concerns are prefixed with `curation_concerns_`
+  def self.use_relative_model_naming?
+    false
+  end
+
   class Engine < ::Rails::Engine
     isolate_namespace CurationConcerns
     require 'breadcrumbs_on_rails'
diff --git a/lib/curation_concerns/rails/routes.rb b/lib/curation_concerns/rails/routes.rb
index 147e19a82..ae15f3187 100644
--- a/lib/curation_concerns/rails/routes.rb
+++ b/lib/curation_concerns/rails/routes.rb
@@ -6,10 +6,10 @@ def curation_concerns_basic_routes
       get 'upload_sets/:id/edit' => 'upload_sets#edit', as: :edit_upload_set
       post 'upload_sets/:id' => 'upload_sets#update', as: :upload_set_file_sets
 
+      CurationConcerns.config.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
+        namespaced_resources curation_concern_name, except: [:index]
+      end
       namespace :curation_concerns, path: :concern do
-        CurationConcerns.config.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
-          namespaced_resources curation_concern_name, except: [:index]
-        end
         resources :permissions, only: [] do
           member do
             get :confirm
@@ -60,16 +60,19 @@ def curation_concerns_embargo_management
 
     private
 
+      # routing namepace arguments, for using a path other than the default
+      ROUTE_OPTIONS = { 'curation_concerns' => { path: :concern } }
+
       # Namespaces routes appropriately
       # @example route_namespaced_target("curation_concerns/generic_work") is equivalent to
-      #   namespace "curation_concerns" do
+      #   namespace "curation_concerns", path: :concern do
       #     resources "generic_work", except: [:index]
       #   end
       def namespaced_resources(target, opts = {})
         if target.include?('/')
           the_namespace = target[0..target.index('/') - 1]
           new_target = target[target.index('/') + 1..-1]
-          namespace the_namespace do
+          namespace the_namespace, ROUTE_OPTIONS.fetch(the_namespace, nil) do
             namespaced_resources(new_target, opts)
           end
         else
diff --git a/lib/generators/curation_concerns/work/templates/controller.rb.erb b/lib/generators/curation_concerns/work/templates/controller.rb.erb
index ce836b087..a4f0865eb 100644
--- a/lib/generators/curation_concerns/work/templates/controller.rb.erb
+++ b/lib/generators/curation_concerns/work/templates/controller.rb.erb
@@ -1,7 +1,9 @@
 # Generated via
 #  `rails generate curation_concerns:work <%= class_name %>`
 
-class CurationConcerns::<%= class_name.pluralize %>Controller < ApplicationController
-  include CurationConcerns::CurationConcernController
-  set_curation_concern_type <%= class_name %>
+module CurationConcerns
+  class <%= class_name.pluralize %>Controller < ApplicationController
+    include CurationConcernController
+    set_curation_concern_type <%= class_name %>
+  end
 end
diff --git a/lib/generators/curation_concerns/work/templates/form.rb.erb b/lib/generators/curation_concerns/work/templates/form.rb.erb
index 4ac209d8a..8b2e99322 100644
--- a/lib/generators/curation_concerns/work/templates/form.rb.erb
+++ b/lib/generators/curation_concerns/work/templates/form.rb.erb
@@ -2,7 +2,7 @@
 #  `rails generate curation_concerns:work <%= class_name %>`
 module CurationConcerns
   class <%= class_name %>Form < CurationConcerns::Forms::WorkForm
-    self.model_class = ::<%= class_name %>
+    self.model_class = <%= class_name %>
   end
 end
 
diff --git a/lib/generators/curation_concerns/work/templates/model.rb.erb b/lib/generators/curation_concerns/work/templates/model.rb.erb
index 6182ed7b8..311e1cf6d 100644
--- a/lib/generators/curation_concerns/work/templates/model.rb.erb
+++ b/lib/generators/curation_concerns/work/templates/model.rb.erb
@@ -1,7 +1,9 @@
 # Generated via
 #  `rails generate curation_concerns:work <%= class_name %>`
-class <%= class_name %> < ActiveFedora::Base
-  include ::CurationConcerns::WorkBehavior
-  include ::CurationConcerns::BasicMetadata
-  validates :title, presence: { message: 'Your work must have a title.' }
+module CurationConcerns
+  class <%= class_name %> < ActiveFedora::Base
+    include WorkBehavior
+    include BasicMetadata
+    validates :title, presence: { message: 'Your work must have a title.' }
+  end
 end
diff --git a/lib/generators/curation_concerns/work/templates/model_spec.rb.erb b/lib/generators/curation_concerns/work/templates/model_spec.rb.erb
index a64e43481..25ce23ef1 100644
--- a/lib/generators/curation_concerns/work/templates/model_spec.rb.erb
+++ b/lib/generators/curation_concerns/work/templates/model_spec.rb.erb
@@ -2,7 +2,7 @@
 #  `rails generate curation_concerns:work <%= class_name %>`
 require 'rails_helper'
 
-describe <%= class_name %> do
+describe CurationConcerns::<%= class_name %> do
   it "has tests" do
     skip "Add your tests here"
   end
diff --git a/lib/generators/curation_concerns/work/work_generator.rb b/lib/generators/curation_concerns/work/work_generator.rb
index 9d015eaa1..19bd22f07 100644
--- a/lib/generators/curation_concerns/work/work_generator.rb
+++ b/lib/generators/curation_concerns/work/work_generator.rb
@@ -23,11 +23,11 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
   # Because I want the output of CurationConcerns::WorkGenerator to include all the processed files.
   def create_model_spec
     return unless rspec_installed?
-    template 'model_spec.rb.erb', "spec/models/#{file_name}_spec.rb"
+    template 'model_spec.rb.erb', "spec/models/curation_concerns/#{file_name}_spec.rb"
   end
 
   def create_model
-    template('model.rb.erb', "app/models/#{file_name}.rb")
+    template('model.rb.erb', "app/models/curation_concerns/#{file_name}.rb")
   end
 
   def create_controller_spec
diff --git a/spec/abilities/generic_work_abilities_spec.rb b/spec/abilities/generic_work_abilities_spec.rb
index 92179e6d3..9a1570816 100644
--- a/spec/abilities/generic_work_abilities_spec.rb
+++ b/spec/abilities/generic_work_abilities_spec.rb
@@ -13,7 +13,7 @@
         let(:creating_user) { user }
         let(:current_user) { user }
         it do
-          should be_able_to(:create, GenericWork.new)
+          should be_able_to(:create, CurationConcerns::GenericWork.new)
           should be_able_to(:read, generic_work)
           should be_able_to(:update, generic_work)
           should be_able_to(:destroy, generic_work)
@@ -25,7 +25,7 @@
         let(:creating_user) { user }
         let(:current_user) { manager_user }
         it do
-          should be_able_to(:create, GenericWork.new)
+          should be_able_to(:create, CurationConcerns::GenericWork.new)
           should be_able_to(:read, generic_work)
           should be_able_to(:update, generic_work)
           should be_able_to(:destroy, generic_work)
@@ -36,7 +36,7 @@
         let(:creating_user) { FactoryGirl.create(:user) }
         let(:current_user) { user }
         it do
-          should be_able_to(:create, GenericWork.new)
+          should be_able_to(:create, CurationConcerns::GenericWork.new)
           should_not be_able_to(:read, generic_work)
           should_not be_able_to(:update, generic_work)
           should_not be_able_to(:destroy, generic_work)
@@ -48,7 +48,7 @@
         let(:creating_user) { FactoryGirl.create(:user) }
         let(:current_user) { nil }
         it do
-          should_not be_able_to(:create, GenericWork.new)
+          should_not be_able_to(:create, CurationConcerns::GenericWork.new)
           should_not be_able_to(:read, generic_work)
           should_not be_able_to(:update, generic_work)
           should_not be_able_to(:destroy, generic_work)
diff --git a/spec/actors/curation_concerns/embargo_actor_spec.rb b/spec/actors/curation_concerns/embargo_actor_spec.rb
index 87ba5fc1e..4a5a1c094 100644
--- a/spec/actors/curation_concerns/embargo_actor_spec.rb
+++ b/spec/actors/curation_concerns/embargo_actor_spec.rb
@@ -4,7 +4,7 @@
   let(:actor) { described_class.new(work) }
 
   let(:work) do
-    GenericWork.new do |work|
+    CurationConcerns::GenericWork.new do |work|
       work.apply_depositor_metadata 'foo'
       work.title = ["test"]
       work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
diff --git a/spec/actors/curation_concerns/lease_actor_spec.rb b/spec/actors/curation_concerns/lease_actor_spec.rb
index d560e8c9a..f9e151b25 100644
--- a/spec/actors/curation_concerns/lease_actor_spec.rb
+++ b/spec/actors/curation_concerns/lease_actor_spec.rb
@@ -4,7 +4,7 @@
   let(:actor) { described_class.new(work) }
 
   let(:work) do
-    GenericWork.new do |work|
+    CurationConcerns::GenericWork.new do |work|
       work.apply_depositor_metadata 'foo'
       work.title = ["test"]
       work.visibility_during_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
diff --git a/spec/actors/curation_concerns/manages_embargoes_actor_spec.rb b/spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
index dacb26341..5e566dfbd 100644
--- a/spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
+++ b/spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
@@ -7,7 +7,7 @@
   end
 
   let(:user) { User.new }
-  let(:curation_concern) { GenericWork.new }
+  let(:curation_concern) { CurationConcerns::GenericWork.new }
   let(:attributes) { {} }
   subject do
     model.new(curation_concern, user, attributes)
diff --git a/spec/actors/curation_concerns/work_actor_spec.rb b/spec/actors/curation_concerns/work_actor_spec.rb
index b2e9909e8..1e451e2f3 100644
--- a/spec/actors/curation_concerns/work_actor_spec.rb
+++ b/spec/actors/curation_concerns/work_actor_spec.rb
@@ -19,7 +19,7 @@
   end
 
   describe '#create' do
-    let(:curation_concern) { GenericWork.new }
+    let(:curation_concern) { CurationConcerns::GenericWork.new }
     let(:xmas) { DateTime.parse('2014-12-25 11:30') }
 
     context 'failure' do
diff --git a/spec/controllers/curation_concerns/classify_concerns_controller_spec.rb b/spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
index 8603ffabe..f6fda9d82 100644
--- a/spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
+++ b/spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
@@ -19,7 +19,7 @@
   describe '#create' do
     context 'without logging in' do
       it 'redirect to login page if user is not logged in' do
-        post :create, classify: { curation_concern_type: 'GenericWork' }
+        post :create, classify: { curation_concern_type: 'CurationConcerns::GenericWork' }
         expect(response).to redirect_to(main_app.user_session_path)
       end
     end
@@ -28,13 +28,13 @@
       before do
         sign_in(user)
         # Had to stub the actual handling of curation_concern paths since those paths live outside the engine while the path to this controller lives inside the engine.
-        expect(subject).to receive(:new_polymorphic_path).with([:curation_concerns, GenericWork]).and_return(main_app.new_curation_concerns_generic_work_path)
+        expect(subject).to receive(:new_polymorphic_path).with([:curation_concerns, CurationConcerns::GenericWork]).and_return(main_app.new_curation_concerns_generic_work_path)
       end
 
       let(:new_curation_concern_generic_work_path) { '/stub/path' }
 
       it 'requires authentication' do
-        post :create, classify_concern: { curation_concern_type: 'GenericWork' }
+        post :create, classify_concern: { curation_concern_type: 'CurationConcerns::GenericWork' }
         expect(response).to redirect_to(main_app.new_curation_concerns_generic_work_path)
       end
     end
diff --git a/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb b/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb
index 0212d0500..29131579a 100644
--- a/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb
+++ b/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb
@@ -33,10 +33,10 @@
     end
 
     describe 'created' do
-      before { post :create, generic_work: { title: ['a title'] }, format: :json }
+      before { post :create, curation_concerns_generic_work: { title: ['a title'] }, format: :json }
       it "returns 201, renders show template sets location header" do
         # Ensure that @curation_concern is set for jbuilder template to use
-        expect(assigns[:curation_concern]).to be_instance_of ::GenericWork
+        expect(assigns[:curation_concern]).to be_instance_of CurationConcerns::GenericWork
         expect(controller).to render_template('curation_concerns/base/show')
         expect(response.code).to eq "201"
         created_resource = assigns[:curation_concern]
@@ -45,7 +45,7 @@
     end
 
     describe 'failed create' do
-      before { post :create, generic_work: {}, format: :json }
+      before { post :create, curation_concerns_generic_work: {}, format: :json }
       it "returns 422 and the errors" do
         created_resource = assigns[:curation_concern]
         expect(response).to respond_unprocessable_entity(errors: created_resource.errors.messages.as_json)
@@ -56,17 +56,17 @@
       before { resource_request }
       it "returns json of the work" do
         # Ensure that @curation_concern is set for jbuilder template to use
-        expect(assigns[:curation_concern]).to be_instance_of ::GenericWork
+        expect(assigns[:curation_concern]).to be_instance_of CurationConcerns::GenericWork
         expect(controller).to render_template('curation_concerns/base/show')
         expect(response.code).to eq "200"
       end
     end
 
     describe 'updated' do
-      before { put :update, id: resource, generic_work: { title: ['updated title'] }, format: :json }
+      before { put :update, id: resource, curation_concerns_generic_work: { title: ['updated title'] }, format: :json }
       it "returns 200, renders show template sets location header" do
         # Ensure that @curation_concern is set for jbuilder template to use
-        expect(assigns[:curation_concern]).to be_instance_of ::GenericWork
+        expect(assigns[:curation_concern]).to be_instance_of CurationConcerns::GenericWork
         expect(controller).to render_template('curation_concerns/base/show')
         expect(response.code).to eq "200"
         created_resource = assigns[:curation_concern]
@@ -75,7 +75,7 @@
     end
 
     describe 'failed update' do
-      before { post :update, id: resource, generic_work: { title: [] }, format: :json }
+      before { post :update, id: resource, curation_concerns_generic_work: { title: [] }, format: :json }
 
       it "returns 422 and the errors" do
         expect(response).to respond_unprocessable_entity(errors: { "title": ["Your work must have a title."] })
diff --git a/spec/controllers/curation_concerns/generic_works_controller_spec.rb b/spec/controllers/curation_concerns/generic_works_controller_spec.rb
index 4f85ae0f3..44e4bd318 100644
--- a/spec/controllers/curation_concerns/generic_works_controller_spec.rb
+++ b/spec/controllers/curation_concerns/generic_works_controller_spec.rb
@@ -54,8 +54,8 @@
   describe '#create' do
     it 'creates a work' do
       expect do
-        post :create, generic_work: { title: ['a title'] }
-      end.to change { GenericWork.count }.by(1)
+        post :create, curation_concerns_generic_work: { title: ['a title'] }
+      end.to change { CurationConcerns::GenericWork.count }.by(1)
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(assigns[:curation_concern])
     end
 
@@ -63,7 +63,7 @@
       before { allow(controller.current_ability).to receive(:can?).and_return(false) }
 
       it 'shows the unauthorized message' do
-        post :create, generic_work: { title: ['a title'] }
+        post :create, curation_concerns_generic_work: { title: ['a title'] }
         expect(response.code).to eq '401'
         expect(response).to render_template(:unauthorized)
       end
@@ -117,7 +117,7 @@
     let(:actor) { double(update: true, visibility_changed?: false) }
 
     it 'updates the work' do
-      patch :update, id: a_work, generic_work: {}
+      patch :update, id: a_work, curation_concerns_generic_work: {}
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(a_work)
     end
 
@@ -164,7 +164,7 @@
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       let(:a_work) { create(:private_generic_work) }
       it 'someone elses private work should update the work' do
-        patch :update, id: a_work, generic_work: {}
+        patch :update, id: a_work, curation_concerns_generic_work: {}
         expect(response).to redirect_to main_app.curation_concerns_generic_work_path(a_work)
       end
     end
@@ -176,7 +176,7 @@
     it 'deletes the work' do
       delete :destroy, id: work_to_be_deleted
       expect(response).to redirect_to main_app.catalog_index_path
-      expect(GenericWork).not_to exist(work_to_be_deleted.id)
+      expect(CurationConcerns::GenericWork).not_to exist(work_to_be_deleted.id)
     end
 
     context 'someone elses public work' do
@@ -193,7 +193,7 @@
       before { allow_any_instance_of(User).to receive(:groups).and_return(['admin']) }
       it 'someone elses private work should delete the work' do
         delete :destroy, id: work_to_be_deleted
-        expect(GenericWork).not_to exist(work_to_be_deleted.id)
+        expect(CurationConcerns::GenericWork).not_to exist(work_to_be_deleted.id)
       end
     end
   end
diff --git a/spec/factories/generic_works.rb b/spec/factories/generic_works.rb
index 2655687e1..0e4e0d8da 100644
--- a/spec/factories/generic_works.rb
+++ b/spec/factories/generic_works.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   # The ::GenericWork model is defined in .internal_test_app/app/models by the
   # curation_concerns:test_app generator.
-  factory :generic_work, aliases: [:work, :private_generic_work], class: GenericWork do
+  factory :generic_work, aliases: [:work, :private_generic_work], class: CurationConcerns::GenericWork do
     transient do
       user { FactoryGirl.create(:user) }
     end
diff --git a/spec/features/collection_spec.rb b/spec/features/collection_spec.rb
index 6bbca3fc3..a7950debb 100644
--- a/spec/features/collection_spec.rb
+++ b/spec/features/collection_spec.rb
@@ -21,10 +21,8 @@ def create_collection(title, description)
   let(:user_key) { user.user_key }
   let(:generic_works) do
     (0..12).map do |x|
-      GenericWork.new.tap do |f|
-        f.title = ["title #{x}"]
+      CurationConcerns::GenericWork.create!(title: ["title #{x}"]) do |f|
         f.apply_depositor_metadata('user1@example.com')
-        f.save!
       end
     end
   end
@@ -38,7 +36,7 @@ def create_collection(title, description)
 
   after(:all) do
     Resque.inline = @old_resque_inline_value
-    GenericWork.destroy_all
+    CurationConcerns::GenericWork.destroy_all
     Collection.destroy_all
   end
 
diff --git a/spec/features/create_work_spec.rb b/spec/features/create_work_spec.rb
index 5a677fbf3..d4644b5c0 100644
--- a/spec/features/create_work_spec.rb
+++ b/spec/features/create_work_spec.rb
@@ -22,7 +22,7 @@
   it 'creates the work and allow you to attach a file' do
     visit '/concern/generic_works/new'
     work_title = 'My Test Work'
-    within('form.new_generic_work') do
+    within('form.new_curation_concerns_generic_work') do
       fill_in('Title', with: work_title)
       attach_file('Upload a file', fixture_file_path('files/image.png'))
       choose('visibility_open')
diff --git a/spec/features/embargo_spec.rb b/spec/features/embargo_spec.rb
index cdb722921..254528988 100644
--- a/spec/features/embargo_spec.rb
+++ b/spec/features/embargo_spec.rb
@@ -17,7 +17,7 @@
       click_link 'New Generic Work'
       fill_in 'Title', with: 'Embargo test'
       choose 'Embargo'
-      fill_in 'generic_work_embargo_release_date', with: future_date
+      fill_in 'curation_concerns_generic_work_embargo_release_date', with: future_date
       select 'Private', from: 'Restricted to'
       select 'Open Access', from: 'then open it up to'
       click_button 'Create Generic work'
@@ -29,7 +29,7 @@
       click_link 'Embargo Management Page'
 
       expect(page).to have_content('This work is under embargo.')
-      expect(page).to have_xpath("//input[@name='generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']") # current embargo date is pre-populated in edit field
+      expect(page).to have_xpath("//input[@name='curation_concerns_generic_work[embargo_release_date]' and @value='#{future_date.to_datetime.iso8601}']") # current embargo date is pre-populated in edit field
 
       fill_in 'until', with: later_future_date.to_s
 
diff --git a/spec/features/lease_spec.rb b/spec/features/lease_spec.rb
index c394a37b8..ec9a7f12c 100644
--- a/spec/features/lease_spec.rb
+++ b/spec/features/lease_spec.rb
@@ -14,7 +14,7 @@
       click_link 'New Generic Work'
       fill_in 'Title', with: 'Lease test'
       choose 'Lease'
-      fill_in 'generic_work_lease_expiration_date', with: future_date
+      fill_in 'curation_concerns_generic_work_lease_expiration_date', with: future_date
       select 'Open Access', from: 'Is available for'
       select 'Private', from: 'then restrict it to'
       click_button 'Create Generic work'
@@ -26,7 +26,7 @@
       click_link 'Lease Management Page'
 
       expect(page).to have_content('This work is under lease.')
-      expect(page).to have_xpath("//input[@name='generic_work[lease_expiration_date]' and @value='#{future_date.to_datetime.iso8601}']") # current lease date is pre-populated in edit field
+      expect(page).to have_xpath("//input[@name='curation_concerns_generic_work[lease_expiration_date]' and @value='#{future_date.to_datetime.iso8601}']") # current lease date is pre-populated in edit field
 
       fill_in 'until', with: later_future_date.to_s
 
diff --git a/spec/features/work_generator_spec.rb b/spec/features/work_generator_spec.rb
index 269f34bdd..757a232b1 100644
--- a/spec/features/work_generator_spec.rb
+++ b/spec/features/work_generator_spec.rb
@@ -14,7 +14,7 @@
 
   before do
     Rails::Generators.invoke('curation_concerns:work', ['Catapult'], destination_root: Rails.root)
-    load "#{EngineCart.destination}/app/models/catapult.rb"
+    load "#{EngineCart.destination}/app/models/curation_concerns/catapult.rb"
     load "#{EngineCart.destination}/app/controllers/curation_concerns/catapults_controller.rb"
     load "#{EngineCart.destination}/app/actors/curation_concerns/catapult_actor.rb"
     load "#{EngineCart.destination}/app/forms/curation_concerns/catapult_form.rb"
@@ -39,14 +39,14 @@
     #   click_button "Attach to Generic Work"
     # end
     catapult_title = 'My Test Work'
-    within('form.new_catapult') do
+    within('form.new_curation_concerns_catapult') do
       fill_in('Title', with: catapult_title)
       attach_file('Upload a file', fixture_file_path('files/image.png'))
       choose('visibility_open')
       click_on('Create Catapult')
     end
     click_on('Edit This Catapult')
-    within('form.edit_catapult') do
+    within('form.edit_curation_concerns_catapult') do
       fill_in('Subject', with: 'test')
       click_on('Update Catapult')
     end
diff --git a/spec/helpers/url_helper_spec.rb b/spec/helpers/url_helper_spec.rb
index 0cd49fdad..37b61869a 100644
--- a/spec/helpers/url_helper_spec.rb
+++ b/spec/helpers/url_helper_spec.rb
@@ -2,7 +2,7 @@
 
 describe CurationConcerns::UrlHelper do
   before do
-    GenericWork.destroy_all
+    CurationConcerns::GenericWork.destroy_all
   end
   let(:profile) { ["{\"datastreams\":{}}"] }
   let(:work) { create(:generic_work) }
diff --git a/spec/jobs/create_derivatives_job_spec.rb b/spec/jobs/create_derivatives_job_spec.rb
index 8f7a04b70..bf48df996 100644
--- a/spec/jobs/create_derivatives_job_spec.rb
+++ b/spec/jobs/create_derivatives_job_spec.rb
@@ -33,7 +33,7 @@
     end
 
     context 'when the file_set is the thumbnail of the parent' do
-      let(:parent) { GenericWork.new(thumbnail_id: id) }
+      let(:parent) { CurationConcerns::GenericWork.new(thumbnail_id: id) }
 
       it 'updates the index of the parent object' do
         expect(parent).to receive(:update_index)
@@ -42,7 +42,7 @@
     end
 
     context "when the file_set isn't the parent's thumbnail" do
-      let(:parent) { GenericWork.new }
+      let(:parent) { CurationConcerns::GenericWork.new }
 
       it "doesn't update the parent's index" do
         expect(parent).to_not receive(:update_index)
diff --git a/spec/models/generic_work_spec.rb b/spec/models/generic_work_spec.rb
index 83dabff43..679ee8589 100644
--- a/spec/models/generic_work_spec.rb
+++ b/spec/models/generic_work_spec.rb
@@ -3,12 +3,17 @@
 # This tests the GenericWork model that is inserted into the host app by curation_concerns:models:install
 # It includes the CurationConcerns::GenericWorkBehavior module and nothing else
 # So this test covers both the GenericWorkBehavior module and the generated GenericWork model
-describe GenericWork do
+describe CurationConcerns::GenericWork do
   it 'has a title' do
     subject.title = ['foo']
     expect(subject.title).to eq ['foo']
   end
 
+  describe '.model_name' do
+    subject { described_class.model_name.singular_route_key }
+    it { is_expected.to eq 'curation_concerns_generic_work' }
+  end
+
   context 'with attached files' do
     subject { FactoryGirl.create(:work_with_files) }
 
diff --git a/spec/presenters/curation_concerns/work_show_presenter_spec.rb b/spec/presenters/curation_concerns/work_show_presenter_spec.rb
index c6df6f315..734404d06 100644
--- a/spec/presenters/curation_concerns/work_show_presenter_spec.rb
+++ b/spec/presenters/curation_concerns/work_show_presenter_spec.rb
@@ -5,7 +5,7 @@
   let(:attributes) do
     { "title_tesim" => ["foo bar"],
       "human_readable_type_tesim" => ["Generic Work"],
-      "has_model_ssim" => ["GenericWork"] }
+      "has_model_ssim" => ["CurationConcerns::GenericWork"] }
   end
 
   let(:ability) { nil }
diff --git a/spec/routing/curation_concerns/routes_spec.rb b/spec/routing/curation_concerns/routes_spec.rb
index 9d608335a..74062793f 100644
--- a/spec/routing/curation_concerns/routes_spec.rb
+++ b/spec/routing/curation_concerns/routes_spec.rb
@@ -50,12 +50,12 @@ module CurationConcerns
       it 'routes to #show' do
         expect(curation_concerns_generic_work_path(generic_work)).to eq "/concern/generic_works/#{generic_work.id}"
         expect(get("/concern/generic_works/#{generic_work.id}")).to route_to(controller: 'curation_concerns/generic_works', action: 'show', id: generic_work.id)
-        expect(url_for([:curation_concerns, generic_work, only_path: true])).to eq "/concern/generic_works/#{generic_work.id}"
+        expect(url_for([generic_work, only_path: true])).to eq "/concern/generic_works/#{generic_work.id}"
       end
       it 'routes to #edit' do
         expect(edit_curation_concerns_generic_work_path(generic_work)).to eq "/concern/generic_works/#{generic_work.id}/edit"
         expect(get("/concern/generic_works/#{generic_work.id}/edit")).to route_to(controller: 'curation_concerns/generic_works', action: 'edit', id: generic_work.id)
-        expect(url_for([:edit, :curation_concerns, generic_work, only_path: true])).to eq "/concern/generic_works/#{generic_work.id}/edit"
+        expect(url_for([:edit, generic_work, only_path: true])).to eq "/concern/generic_works/#{generic_work.id}/edit"
       end
     end
   end
diff --git a/spec/search_builders/curation_concerns/search_builder_spec.rb b/spec/search_builders/curation_concerns/search_builder_spec.rb
index cfbd6dc8c..c437c3527 100644
--- a/spec/search_builders/curation_concerns/search_builder_spec.rb
+++ b/spec/search_builders/curation_concerns/search_builder_spec.rb
@@ -54,7 +54,7 @@
     before { subject.filter_models(solr_params) }
 
     it 'limits query to collection and generic work' do
-      expect(solr_params[:fq].first).to match(/{!raw f=has_model_ssim}GenericWork.*OR.*{!raw f=has_model_ssim}Collection/)
+      expect(solr_params[:fq].first).to match(/{!raw f=has_model_ssim}CurationConcerns::GenericWork.*OR.*{!raw f=has_model_ssim}Collection/)
     end
   end
 end
diff --git a/spec/services/lease_service_spec.rb b/spec/services/lease_service_spec.rb
index 30ace9363..95d98ef64 100644
--- a/spec/services/lease_service_spec.rb
+++ b/spec/services/lease_service_spec.rb
@@ -2,7 +2,7 @@
 
 describe CurationConcerns::LeaseService do
   subject { described_class }
-  before { GenericWork.destroy_all }
+  before { CurationConcerns::GenericWork.destroy_all }
 
   let(:future_date) { 2.days.from_now }
   let(:past_date) { 2.days.ago }
diff --git a/spec/services/thumbnail_path_service_spec.rb b/spec/services/thumbnail_path_service_spec.rb
index e5b81fd7a..8efd47655 100644
--- a/spec/services/thumbnail_path_service_spec.rb
+++ b/spec/services/thumbnail_path_service_spec.rb
@@ -25,7 +25,7 @@
 
   context "with a Work" do
     context "that has a thumbnail" do
-      let(:object) { GenericWork.new(thumbnail_id: '999') }
+      let(:object) { CurationConcerns::GenericWork.new(thumbnail_id: '999') }
       let(:representative) { FileSet.new(id: '777') }
       before do
         allow(File).to receive(:exist?).and_return(true)
diff --git a/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb b/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
index 8c1a7f239..c86538fa5 100644
--- a/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+++ b/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'curation_concerns/base/_form_permission.html.erb' do
-  let(:curation_concern) { GenericWork.new }
+  let(:curation_concern) { CurationConcerns::GenericWork.new }
   before do
     f = double('form', object: curation_concern, object_name: nil, input: nil)
     render partial: "curation_concerns/base/form_permission", locals: { f: f }
diff --git a/spec/views/curation_concerns/base/show.html.erb_spec.rb b/spec/views/curation_concerns/base/show.html.erb_spec.rb
index a787d09be..0deeacfcb 100644
--- a/spec/views/curation_concerns/base/show.html.erb_spec.rb
+++ b/spec/views/curation_concerns/base/show.html.erb_spec.rb
@@ -8,7 +8,7 @@
     SolrDocument.new(
       id: '999',
       object_profile_ssm: object_profile,
-      has_model_ssim: ['GenericWork'],
+      has_model_ssim: ['CurationConcerns::GenericWork'],
       human_readable_type_tesim: ['Generic Work'],
       contributor_tesim: contributor,
       creator_tesim: creator,
@@ -31,7 +31,7 @@
 
     it 'draws the page' do
       expect(rendered).to have_link 'Attribution 3.0 United States', href: 'http://creativecommons.org/licenses/by/3.0/us/'
-      expect(rendered).to have_link 'Edit This Generic Work', href: edit_polymorphic_path([:curation_concerns, presenter])
+      expect(rendered).to have_link 'Edit This Generic Work', href: edit_polymorphic_path(presenter)
     end
   end
 
diff --git a/spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb b/spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
index bd3120884..935ec9581 100644
--- a/spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
+++ b/spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
@@ -3,6 +3,7 @@
 describe 'curation_concerns/file_sets/_file_set.html.erb' do
   let(:solr_document) { SolrDocument.new(id: '999',
                                          has_model_ssim: ['FileSet'],
+                                         active_fedora_model_ssi: 'FileSet',
                                          thumbnail_path_ss: '/downloads/999?file=thumbnail',
                                          representative_tesim: ["999"],
                                          title_tesim: ["My File"]) }
diff --git a/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb b/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
index 66819ff48..b9405dab7 100644
--- a/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
+++ b/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
@@ -5,7 +5,7 @@
     allow(view).to receive(:parent).and_return(parent)
   end
 
-  let(:parent) { stub_model(GenericWork) }
+  let(:parent) { stub_model(CurationConcerns::GenericWork) }
 
   let(:depositor) do
     stub_model(User,
diff --git a/spec/views/shared/_add_content.html.erb_spec.rb b/spec/views/shared/_add_content.html.erb_spec.rb
index ecdbebbb2..3f1b80afd 100644
--- a/spec/views/shared/_add_content.html.erb_spec.rb
+++ b/spec/views/shared/_add_content.html.erb_spec.rb
@@ -14,7 +14,7 @@
 
     it 'has links to create works and collections' do
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
-        expect(rendered).to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path([:curation_concerns, curation_concern_type]))
+        expect(rendered).to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
       expect(rendered).to have_link('Add a Collection', href: collections.new_collection_path)
     end
@@ -30,7 +30,7 @@
 
     it 'has links to add collections but not to add works' do
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
-        expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path([:curation_concerns, curation_concern_type]))
+        expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
       expect(rendered).to have_link('Add a Collection', href: collections.new_collection_path)
     end
@@ -47,7 +47,7 @@
       expect(rendered).not_to have_text('Add')
       expect(rendered).not_to have_text('Admin')
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
-        expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path([:curation_concerns, curation_concern_type]))
+        expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
       expect(rendered).not_to have_link('Add a Collection', href: collections.new_collection_path)
     end