diff --git a/features/project/archived_projects.feature b/features/project/archived.feature
similarity index 100%
rename from features/project/archived_projects.feature
rename to features/project/archived.feature
diff --git a/features/project/commits/commit_comments.feature b/features/project/commits/comments.feature
similarity index 100%
rename from features/project/commits/commit_comments.feature
rename to features/project/commits/comments.feature
diff --git a/features/project/commits/commit_diff_comments.feature b/features/project/commits/diff_comments.feature
similarity index 100%
rename from features/project/commits/commit_diff_comments.feature
rename to features/project/commits/diff_comments.feature
diff --git a/features/project/commits/commits_user_lookup.feature b/features/project/commits/user_lookup.feature
similarity index 100%
rename from features/project/commits/commits_user_lookup.feature
rename to features/project/commits/user_lookup.feature
diff --git a/features/project/create_project.feature b/features/project/create.feature
similarity index 100%
rename from features/project/create_project.feature
rename to features/project/create.feature
diff --git a/features/project/fork_project.feature b/features/project/fork.feature
similarity index 100%
rename from features/project/fork_project.feature
rename to features/project/fork.feature
diff --git a/features/project/public_projects.feature b/features/project/public.feature
similarity index 100%
rename from features/project/public_projects.feature
rename to features/project/public.feature
diff --git a/features/public/public_projects.feature b/features/public/projects.feature
similarity index 100%
rename from features/public/public_projects.feature
rename to features/public/projects.feature
diff --git a/features/snippets/discover_snippets.feature b/features/snippets/discover.feature
similarity index 100%
rename from features/snippets/discover_snippets.feature
rename to features/snippets/discover.feature
diff --git a/features/snippets/user_snippets.feature b/features/snippets/user.feature
similarity index 100%
rename from features/snippets/user_snippets.feature
rename to features/snippets/user.feature
diff --git a/features/steps/admin/admin_active_tab.rb b/features/steps/admin/active_tab.rb
similarity index 100%
rename from features/steps/admin/admin_active_tab.rb
rename to features/steps/admin/active_tab.rb
diff --git a/features/steps/admin/admin_broadcast_messages.rb b/features/steps/admin/broadcast_messages.rb
similarity index 100%
rename from features/steps/admin/admin_broadcast_messages.rb
rename to features/steps/admin/broadcast_messages.rb
diff --git a/features/steps/admin/admin_groups.rb b/features/steps/admin/groups.rb
similarity index 100%
rename from features/steps/admin/admin_groups.rb
rename to features/steps/admin/groups.rb
diff --git a/features/steps/admin/admin_logs.rb b/features/steps/admin/logs.rb
similarity index 100%
rename from features/steps/admin/admin_logs.rb
rename to features/steps/admin/logs.rb
diff --git a/features/steps/admin/admin_projects.rb b/features/steps/admin/projects.rb
similarity index 100%
rename from features/steps/admin/admin_projects.rb
rename to features/steps/admin/projects.rb
diff --git a/features/steps/admin/admin_users.rb b/features/steps/admin/users.rb
similarity index 100%
rename from features/steps/admin/admin_users.rb
rename to features/steps/admin/users.rb
diff --git a/features/steps/dashboard/dashboard_active_tab.rb b/features/steps/dashboard/active_tab.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_active_tab.rb
rename to features/steps/dashboard/active_tab.rb
diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/event_filters.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_event_filters.rb
rename to features/steps/dashboard/event_filters.rb
diff --git a/features/steps/dashboard/dashboard_issues.rb b/features/steps/dashboard/issues.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_issues.rb
rename to features/steps/dashboard/issues.rb
diff --git a/features/steps/dashboard/dashboard_merge_requests.rb b/features/steps/dashboard/merge_requests.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_merge_requests.rb
rename to features/steps/dashboard/merge_requests.rb
diff --git a/features/steps/dashboard/dashboard_projects.rb b/features/steps/dashboard/projects.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_projects.rb
rename to features/steps/dashboard/projects.rb
diff --git a/features/steps/dashboard/dashboard_search.rb b/features/steps/dashboard/search.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_search.rb
rename to features/steps/dashboard/search.rb
diff --git a/features/steps/dashboard/dashboard_with_archived_projects.rb b/features/steps/dashboard/with_archived_projects.rb
similarity index 100%
rename from features/steps/dashboard/dashboard_with_archived_projects.rb
rename to features/steps/dashboard/with_archived_projects.rb
diff --git a/features/steps/profile/profile_active_tab.rb b/features/steps/profile/active_tab.rb
similarity index 100%
rename from features/steps/profile/profile_active_tab.rb
rename to features/steps/profile/active_tab.rb
diff --git a/features/steps/profile/profile_emails.rb b/features/steps/profile/emails.rb
similarity index 100%
rename from features/steps/profile/profile_emails.rb
rename to features/steps/profile/emails.rb
diff --git a/features/steps/profile/profile_notifications.rb b/features/steps/profile/notifications.rb
similarity index 100%
rename from features/steps/profile/profile_notifications.rb
rename to features/steps/profile/notifications.rb
diff --git a/features/steps/profile/profile_ssh_keys.rb b/features/steps/profile/ssh_keys.rb
similarity index 100%
rename from features/steps/profile/profile_ssh_keys.rb
rename to features/steps/profile/ssh_keys.rb
diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/active_tab.rb
similarity index 100%
rename from features/steps/project/project_active_tab.rb
rename to features/steps/project/active_tab.rb
diff --git a/features/steps/project/project_archived.rb b/features/steps/project/archived.rb
similarity index 100%
rename from features/steps/project/project_archived.rb
rename to features/steps/project/archived.rb
diff --git a/features/steps/project/project_browse_branches.rb b/features/steps/project/browse_branches.rb
similarity index 100%
rename from features/steps/project/project_browse_branches.rb
rename to features/steps/project/browse_branches.rb
diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/browse_commits.rb
similarity index 100%
rename from features/steps/project/project_browse_commits.rb
rename to features/steps/project/browse_commits.rb
diff --git a/features/steps/project/project_browse_commits_user_lookup.rb b/features/steps/project/browse_commits_user_lookup.rb
similarity index 100%
rename from features/steps/project/project_browse_commits_user_lookup.rb
rename to features/steps/project/browse_commits_user_lookup.rb
diff --git a/features/steps/project/project_browse_files.rb b/features/steps/project/browse_files.rb
similarity index 100%
rename from features/steps/project/project_browse_files.rb
rename to features/steps/project/browse_files.rb
diff --git a/features/steps/project/project_browse_git_repo.rb b/features/steps/project/browse_git_repo.rb
similarity index 100%
rename from features/steps/project/project_browse_git_repo.rb
rename to features/steps/project/browse_git_repo.rb
diff --git a/features/steps/project/project_browse_tags.rb b/features/steps/project/browse_tags.rb
similarity index 100%
rename from features/steps/project/project_browse_tags.rb
rename to features/steps/project/browse_tags.rb
diff --git a/features/steps/project/create_project.rb b/features/steps/project/create.rb
similarity index 100%
rename from features/steps/project/create_project.rb
rename to features/steps/project/create.rb
diff --git a/features/steps/project/project_filter_labels.rb b/features/steps/project/filter_labels.rb
similarity index 100%
rename from features/steps/project/project_filter_labels.rb
rename to features/steps/project/filter_labels.rb
diff --git a/features/steps/project/project_fork.rb b/features/steps/project/fork.rb
similarity index 100%
rename from features/steps/project/project_fork.rb
rename to features/steps/project/fork.rb
diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
similarity index 100%
rename from features/steps/project/project_forked_merge_requests.rb
rename to features/steps/project/forked_merge_requests.rb
diff --git a/features/steps/project/project_graph.rb b/features/steps/project/graph.rb
similarity index 100%
rename from features/steps/project/project_graph.rb
rename to features/steps/project/graph.rb
diff --git a/features/steps/project/project_hooks.rb b/features/steps/project/hooks.rb
similarity index 100%
rename from features/steps/project/project_hooks.rb
rename to features/steps/project/hooks.rb
diff --git a/features/steps/project/project_issue_tracker.rb b/features/steps/project/issue_tracker.rb
similarity index 100%
rename from features/steps/project/project_issue_tracker.rb
rename to features/steps/project/issue_tracker.rb
diff --git a/features/steps/project/project_issues.rb b/features/steps/project/issues.rb
similarity index 100%
rename from features/steps/project/project_issues.rb
rename to features/steps/project/issues.rb
diff --git a/features/steps/project/project_labels.rb b/features/steps/project/labels.rb
similarity index 100%
rename from features/steps/project/project_labels.rb
rename to features/steps/project/labels.rb
diff --git a/features/steps/project/project_markdown_render.rb b/features/steps/project/markdown_render.rb
similarity index 100%
rename from features/steps/project/project_markdown_render.rb
rename to features/steps/project/markdown_render.rb
diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/merge_requests.rb
similarity index 100%
rename from features/steps/project/project_merge_requests.rb
rename to features/steps/project/merge_requests.rb
diff --git a/features/steps/project/project_milestones.rb b/features/steps/project/milestones.rb
similarity index 100%
rename from features/steps/project/project_milestones.rb
rename to features/steps/project/milestones.rb
diff --git a/features/steps/project/project_multiselect_blob.rb b/features/steps/project/multiselect_blob.rb
similarity index 100%
rename from features/steps/project/project_multiselect_blob.rb
rename to features/steps/project/multiselect_blob.rb
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/network_graph.rb
similarity index 100%
rename from features/steps/project/project_network_graph.rb
rename to features/steps/project/network_graph.rb
diff --git a/features/steps/project/public_projects.rb b/features/steps/project/public.rb
similarity index 100%
rename from features/steps/project/public_projects.rb
rename to features/steps/project/public.rb
diff --git a/features/steps/project/project_search_code.rb b/features/steps/project/search_code.rb
similarity index 100%
rename from features/steps/project/project_search_code.rb
rename to features/steps/project/search_code.rb
diff --git a/features/steps/project/project_services.rb b/features/steps/project/services.rb
similarity index 100%
rename from features/steps/project/project_services.rb
rename to features/steps/project/services.rb
diff --git a/features/steps/project/project_snippets.rb b/features/steps/project/snippets.rb
similarity index 100%
rename from features/steps/project/project_snippets.rb
rename to features/steps/project/snippets.rb
diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/team_management.rb
similarity index 100%
rename from features/steps/project/project_team_management.rb
rename to features/steps/project/team_management.rb
diff --git a/features/steps/project/project_wall.rb b/features/steps/project/wall.rb
similarity index 100%
rename from features/steps/project/project_wall.rb
rename to features/steps/project/wall.rb
diff --git a/features/steps/project/project_wiki.rb b/features/steps/project/wiki.rb
similarity index 100%
rename from features/steps/project/project_wiki.rb
rename to features/steps/project/wiki.rb
diff --git a/features/steps/public/projects_feature.rb b/features/steps/public/projects.rb
similarity index 100%
rename from features/steps/public/projects_feature.rb
rename to features/steps/public/projects.rb
diff --git a/features/steps/snippets/discover_snippets.rb b/features/steps/snippets/discover.rb
similarity index 100%
rename from features/steps/snippets/discover_snippets.rb
rename to features/steps/snippets/discover.rb
diff --git a/features/steps/snippets/user_snippets.rb b/features/steps/snippets/user.rb
similarity index 100%
rename from features/steps/snippets/user_snippets.rb
rename to features/steps/snippets/user.rb