diff --git a/staff-features/accessions/accession_create.feature b/staff_features/accessions/accession_create.feature
similarity index 100%
rename from staff-features/accessions/accession_create.feature
rename to staff_features/accessions/accession_create.feature
diff --git a/staff-features/accessions/accession_delete.feature b/staff_features/accessions/accession_delete.feature
similarity index 100%
rename from staff-features/accessions/accession_delete.feature
rename to staff_features/accessions/accession_delete.feature
diff --git a/staff-features/accessions/accessions_search.feature b/staff_features/accessions/accessions_search.feature
similarity index 100%
rename from staff-features/accessions/accessions_search.feature
rename to staff_features/accessions/accessions_search.feature
diff --git a/staff-features/accessions/step_definitions/accession_create.rb b/staff_features/accessions/step_definitions/accession_create.rb
similarity index 100%
rename from staff-features/accessions/step_definitions/accession_create.rb
rename to staff_features/accessions/step_definitions/accession_create.rb
diff --git a/staff-features/accessions/step_definitions/accession_delete.rb b/staff_features/accessions/step_definitions/accession_delete.rb
similarity index 100%
rename from staff-features/accessions/step_definitions/accession_delete.rb
rename to staff_features/accessions/step_definitions/accession_delete.rb
diff --git a/staff-features/accessions/step_definitions/accessions_search.rb b/staff_features/accessions/step_definitions/accessions_search.rb
similarity index 100%
rename from staff-features/accessions/step_definitions/accessions_search.rb
rename to staff_features/accessions/step_definitions/accessions_search.rb
diff --git a/staff-features/digital-objects/digital_object_create.feature b/staff_features/digital_objects/digital_object_create.feature
similarity index 95%
rename from staff-features/digital-objects/digital_object_create.feature
rename to staff_features/digital_objects/digital_object_create.feature
index fbd2c472..80e578a9 100644
--- a/staff-features/digital-objects/digital_object_create.feature
+++ b/staff_features/digital_objects/digital_object_create.feature
@@ -1,4 +1,4 @@
-Feature: Create Digital Object
+Feature: Digital Object Create
   Background:
     Given an administrator user is logged in
   Scenario: Digital Object is created
diff --git a/staff-features/digital-objects/digital_object_create.rb b/staff_features/digital_objects/digital_object_create.rb
similarity index 100%
rename from staff-features/digital-objects/digital_object_create.rb
rename to staff_features/digital_objects/digital_object_create.rb
diff --git a/staff-features/repositories/repository_create.feature b/staff_features/repositories/repository_create.feature
similarity index 95%
rename from staff-features/repositories/repository_create.feature
rename to staff_features/repositories/repository_create.feature
index 9e3e7560..2490c511 100644
--- a/staff-features/repositories/repository_create.feature
+++ b/staff_features/repositories/repository_create.feature
@@ -1,4 +1,4 @@
-Feature: Create repository
+Feature: Repository Create
   Scenario: Repository can be created from an admin user
     Given an administrator user is logged in
     When the user clicks on 'System'
diff --git a/staff-features/repositories/repository_create.rb b/staff_features/repositories/repository_create.rb
similarity index 100%
rename from staff-features/repositories/repository_create.rb
rename to staff_features/repositories/repository_create.rb
diff --git a/staff-features/resources/update_basic_information.feature b/staff_features/resources/resource_update_basic_information.feature
similarity index 95%
rename from staff-features/resources/update_basic_information.feature
rename to staff_features/resources/resource_update_basic_information.feature
index 376b7977..57bc1c0f 100644
--- a/staff-features/resources/update_basic_information.feature
+++ b/staff_features/resources/resource_update_basic_information.feature
@@ -1,4 +1,4 @@
-Feature: Update Resource Basic Information
+Feature: Resource Update Basic Information
   Background:
     Given an administrator user is logged in
     And a resource has been created
diff --git a/staff-features/resources/update_basic_information.rb b/staff_features/resources/resource_update_basic_information.rb
similarity index 100%
rename from staff-features/resources/update_basic_information.rb
rename to staff_features/resources/resource_update_basic_information.rb
diff --git a/staff-features/shared/step_definitions.rb b/staff_features/shared/step_definitions.rb
similarity index 100%
rename from staff-features/shared/step_definitions.rb
rename to staff_features/shared/step_definitions.rb
diff --git a/staff-features/users/user_create.feature b/staff_features/users/user_create.feature
similarity index 97%
rename from staff-features/users/user_create.feature
rename to staff_features/users/user_create.feature
index 6e674cb8..7167c08f 100644
--- a/staff-features/users/user_create.feature
+++ b/staff_features/users/user_create.feature
@@ -1,4 +1,4 @@
-Feature: Create User
+Feature: User Create
   Background:
     Given an administrator user is logged in
   Scenario: User is created
diff --git a/staff-features/users/user_create.rb b/staff_features/users/user_create.rb
similarity index 100%
rename from staff-features/users/user_create.rb
rename to staff_features/users/user_create.rb