diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml
index ee086d88e3e..ff85e32bc4e 100644
--- a/app/views/dashboard/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/_zero_authorized_projects.html.haml
@@ -46,5 +46,5 @@
         %br
         Public projects are an easy way to allow everyone to have read-only access.
       .link_holder
-        = link_to public_projects_path, class: "btn btn-new" do
+        = link_to explore_projects_path, class: "btn btn-new" do
           Browse public projects »
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index 32796c8b2b8..c8bf78385e8 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -1,6 +1,6 @@
 .clearfix
   .pull-left
-    = form_tag public_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
+    = form_tag explore_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
       .form-group
         = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
       .form-group
@@ -17,15 +17,15 @@
         %b.caret
       %ul.dropdown-menu
         %li
-          = link_to public_projects_path(sort: nil) do
+          = link_to explore_projects_path(sort: nil) do
             Name
-          = link_to public_projects_path(sort: 'newest') do
+          = link_to explore_projects_path(sort: 'newest') do
             Newest
-          = link_to public_projects_path(sort: 'oldest') do
+          = link_to explore_projects_path(sort: 'oldest') do
             Oldest
-          = link_to public_projects_path(sort: 'recently_updated') do
+          = link_to explore_projects_path(sort: 'recently_updated') do
             Recently updated
-          = link_to public_projects_path(sort: 'last_updated') do
+          = link_to explore_projects_path(sort: 'last_updated') do
             Last updated
 
 %hr
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 5b28273d5dd..18bb1ac0ba4 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -8,4 +8,4 @@
       = render @trending_projects
 
   .center
-    = link_to 'Show all projects', public_projects_path, class: 'btn btn-primary'
+    = link_to 'Show all projects', explore_projects_path, class: 'btn btn-primary'
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 63992a22f32..5d7f72e6b31 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -3,7 +3,7 @@
     .container
       %div.app_logo
         %span.separator
-        = link_to public_root_path, class: "home" do
+        = link_to explore_root_path, class: "home" do
           %h1 GITLAB
         %span.separator
       %h1.title= title
diff --git a/features/public/projects.feature b/features/explore/projects.feature
similarity index 99%
rename from features/public/projects.feature
rename to features/explore/projects.feature
index c7bb3b4f8ce..2ed9707ec39 100644
--- a/features/public/projects.feature
+++ b/features/explore/projects.feature
@@ -1,5 +1,5 @@
 @public
-Feature: Public Projects Feature
+Feature: Explore Projects Feature
   Background:
     Given public project "Community"
     And internal project "Internal"
diff --git a/features/public/public_groups.feature b/features/explore/public_groups.feature
similarity index 99%
rename from features/public/public_groups.feature
rename to features/explore/public_groups.feature
index ff3e1e3e955..825e3da934e 100644
--- a/features/public/public_groups.feature
+++ b/features/explore/public_groups.feature
@@ -1,5 +1,5 @@
 @public
-Feature: Public Projects Feature
+Feature: Explore Groups Feature
   Background:
     Given group "TestGroup" has private project "Enterprise"
 
diff --git a/features/steps/public/groups_feature.rb b/features/steps/explore/groups_feature.rb
similarity index 96%
rename from features/steps/public/groups_feature.rb
rename to features/steps/explore/groups_feature.rb
index 015deca5427..48486a83424 100644
--- a/features/steps/public/groups_feature.rb
+++ b/features/steps/explore/groups_feature.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
+class Spinach::Features::ExploreGroupsFeature < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedGroup
@@ -15,7 +15,7 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
   step 'group "TestGroup" has public project "Community"' do
     group_has_project("TestGroup", "Community", Gitlab::VisibilityLevel::PUBLIC)
   end
-  
+
   step '"John Doe" is owner of group "TestGroup"' do
     group = Group.find_by(name: "TestGroup") || create(:group, name: "TestGroup")
     user = create(:user, name: "John Doe")
@@ -37,31 +37,31 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
   step 'I visit group "TestGroup" members page' do
     visit members_group_path(Group.find_by(name: "TestGroup"))
   end
-  
+
   step 'I should not see project "Enterprise" items' do
     page.should_not have_content "Enterprise"
   end
-  
+
   step 'I should see project "Internal" items' do
     page.should have_content "Internal"
   end
-  
+
   step 'I should not see project "Internal" items' do
     page.should_not have_content "Internal"
   end
-  
+
   step 'I should see project "Community" items' do
     page.should have_content "Community"
   end
-  
+
   step 'I change filter to Everyone\'s' do
     click_link "Everyone's"
   end
-  
+
   step 'I should see group member "John Doe"' do
     page.should have_content "John Doe"
   end
-  
+
   step 'I should not see member roles' do
     page.body.should_not match(%r{owner|developer|reporter|guest}i)
   end
diff --git a/features/steps/public/projects.rb b/features/steps/explore/projects.rb
similarity index 98%
rename from features/steps/public/projects.rb
rename to features/steps/explore/projects.rb
index 7c7311bb91c..8aa2916014b 100644
--- a/features/steps/public/projects.rb
+++ b/features/steps/explore/projects.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
+class Spinach::Features::ExploreProjectsFeature < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedProject
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index d92c70c952e..a0b4099ab3e 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -324,7 +324,7 @@ module SharedPaths
   # ----------------------------------------
 
   step 'I visit the public projects area' do
-    visit public_root_path
+    visit explore_projects_path
   end
 
   step 'I visit public page for "Community" project' do
@@ -336,7 +336,7 @@ module SharedPaths
   # ----------------------------------------
 
   step 'I visit the public groups area' do
-    visit public_groups_path
+    visit explore_groups_path
   end
 
   # ----------------------------------------