diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.html b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.html
index c804933f2d..85c22de2aa 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.html
@@ -27,7 +27,6 @@ limitations under the License.
 <link rel="import" href="../gr-create-group-dialog/gr-create-group-dialog.html">
 <link rel="import" href="../gr-create-project-dialog/gr-create-project-dialog.html">
 <link rel="import" href="../gr-admin-group-list/gr-admin-group-list.html">
-<link rel="import" href="../gr-admin-project-list/gr-admin-project-list.html">
 <link rel="import" href="../gr-group/gr-group.html">
 <link rel="import" href="../gr-group-audit-log/gr-group-audit-log.html">
 <link rel="import" href="../gr-group-members/gr-group-members.html">
@@ -36,6 +35,7 @@ limitations under the License.
 <link rel="import" href="../gr-project-access/gr-project-access.html">
 <link rel="import" href="../gr-project-commands/gr-project-commands.html">
 <link rel="import" href="../gr-project-detail-list/gr-project-detail-list.html">
+<link rel="import" href="../gr-project-list/gr-project-list.html">
 
 <dom-module id="gr-admin-view">
   <template>
@@ -75,8 +75,7 @@ limitations under the License.
     </gr-page-nav>
     <template is="dom-if" if="[[_showProjectList]]" restamp="true">
       <main class="table">
-        <gr-admin-project-list class="table" params="[[params]]">
-        </gr-admin-project-list>
+        <gr-project-list class="table" params="[[params]]"></gr-project-list>
       </main>
     </template>
     <template is="dom-if" if="[[_showProjectMain]]" restamp="true">
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
index e75c636618..2d8da15cfa 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
@@ -17,7 +17,7 @@
   const ADMIN_LINKS = [{
     name: 'Projects',
     url: '/admin/projects',
-    view: 'gr-admin-project-list',
+    view: 'gr-project-list',
     viewableToAll: true,
     children: [],
   }, {
@@ -191,7 +191,7 @@
           params.adminView === 'gr-project-commands');
       this.set('_showProjectMain', params.adminView === 'gr-project');
       this.set('_showProjectList',
-          params.adminView === 'gr-admin-project-list');
+          params.adminView === 'gr-project-list');
       this.set('_showProjectDetailList',
           params.adminView === 'gr-project-detail-list');
       this.set('_showPluginList', params.adminView === 'gr-plugin-list');
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.html b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.html
index 746b7bb215..117940a3b8 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.html
@@ -70,18 +70,18 @@ limitations under the License.
       element._filteredLinks = [{
         name: 'Projects',
         url: '/admin/projects',
-        view: 'gr-admin-project-list',
+        view: 'gr-project-list',
         children: [],
       }];
 
       element.params = {
-        adminView: 'gr-admin-project-list',
+        adminView: 'gr-project-list',
       };
 
       flushAsynchronousOperations();
       assert.equal(Polymer.dom(element.root).querySelectorAll(
           '.selected').length, 1);
-      assert.ok(element.$$('gr-admin-project-list'));
+      assert.ok(element.$$('gr-project-list'));
       assert.isNotOk(element.$$('gr-admin-create-project'));
     });
 
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.html
similarity index 97%
rename from polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html
rename to polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.html
index 1b6da09345..6c45704b8b 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.html
+++ b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.html
@@ -26,7 +26,7 @@ limitations under the License.
 <link rel="import" href="../gr-create-project-dialog/gr-create-project-dialog.html">
 
 
-<dom-module id="gr-admin-project-list">
+<dom-module id="gr-project-list">
   <template>
     <style include="shared-styles"></style>
     <style include="gr-table-styles"></style>
@@ -94,5 +94,5 @@ limitations under the License.
     </gr-overlay>
     <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
   </template>
-  <script src="gr-admin-project-list.js"></script>
+  <script src="gr-project-list.js"></script>
 </dom-module>
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.js
similarity index 99%
rename from polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js
rename to polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.js
index 4f93e98753..3b568cae3b 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list.js
@@ -15,7 +15,7 @@
   'use strict';
 
   Polymer({
-    is: 'gr-admin-project-list',
+    is: 'gr-project-list',
 
     properties: {
       /**
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list_test.html
similarity index 96%
rename from polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html
rename to polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list_test.html
index ee3f832986..117df3af4d 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project-list/gr-admin-project-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-project-list/gr-project-list_test.html
@@ -16,19 +16,19 @@ limitations under the License.
 -->
 
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-<title>gr-admin-project-list</title>
+<title>gr-project-list</title>
 
 <script src="../../../bower_components/page/page.js"></script>
 <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
 <script src="../../../bower_components/web-component-tester/browser.js"></script>
 <link rel="import" href="../../../test/common-test-setup.html"/>
-<link rel="import" href="gr-admin-project-list.html">
+<link rel="import" href="gr-project-list.html">
 
 <script>void(0);</script>
 
 <test-fixture id="basic">
   <template>
-    <gr-admin-project-list></gr-admin-project-list>
+    <gr-project-list></gr-project-list>
   </template>
 </test-fixture>
 
@@ -47,7 +47,7 @@ limitations under the License.
     };
   };
 
-  suite('gr-admin-project-list tests', () => {
+  suite('gr-project-list tests', () => {
     let element;
     let projects;
     let sandbox;
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index 76b57fa861..a2b70f446b 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -698,7 +698,7 @@
     _handleProjectListOffsetRoute(data) {
       this._setParams({
         view: Gerrit.Nav.View.ADMIN,
-        adminView: 'gr-admin-project-list',
+        adminView: 'gr-project-list',
         offset: data.params[1] || 0,
         filter: null,
       });
@@ -707,7 +707,7 @@
     _handleProjectListFilterOffsetRoute(data) {
       this._setParams({
         view: Gerrit.Nav.View.ADMIN,
-        adminView: 'gr-admin-project-list',
+        adminView: 'gr-project-list',
         offset: data.params.offset,
         filter: data.params.filter,
       });
@@ -716,7 +716,7 @@
     _handleProjectListFilterRoute(data) {
       this._setParams({
         view: Gerrit.Nav.View.ADMIN,
-        adminView: 'gr-admin-project-list',
+        adminView: 'gr-project-list',
         filter: data.params.filter || null,
       });
     },
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.html b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.html
index 19dfe3649d..bb53b09932 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.html
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.html
@@ -797,7 +797,7 @@ limitations under the License.
             const data = {params: {}};
             assertDataToParams(data, '_handleProjectListOffsetRoute', {
               view: Gerrit.Nav.View.ADMIN,
-              adminView: 'gr-admin-project-list',
+              adminView: 'gr-project-list',
               offset: 0,
               filter: null,
             });
@@ -805,7 +805,7 @@ limitations under the License.
             data.params[1] = 42;
             assertDataToParams(data, '_handleProjectListOffsetRoute', {
               view: Gerrit.Nav.View.ADMIN,
-              adminView: 'gr-admin-project-list',
+              adminView: 'gr-project-list',
               offset: 42,
               filter: null,
             });
@@ -815,7 +815,7 @@ limitations under the License.
             const data = {params: {filter: 'foo', offset: 42}};
             assertDataToParams(data, '_handleProjectListFilterOffsetRoute', {
               view: Gerrit.Nav.View.ADMIN,
-              adminView: 'gr-admin-project-list',
+              adminView: 'gr-project-list',
               offset: 42,
               filter: 'foo',
             });
@@ -825,14 +825,14 @@ limitations under the License.
             const data = {params: {}};
             assertDataToParams(data, '_handleProjectListFilterRoute', {
               view: Gerrit.Nav.View.ADMIN,
-              adminView: 'gr-admin-project-list',
+              adminView: 'gr-project-list',
               filter: null,
             });
 
             data.params.filter = 'foo';
             assertDataToParams(data, '_handleProjectListFilterRoute', {
               view: Gerrit.Nav.View.ADMIN,
-              adminView: 'gr-admin-project-list',
+              adminView: 'gr-project-list',
               filter: 'foo',
             });
           });
diff --git a/polygerrit-ui/app/test/index.html b/polygerrit-ui/app/test/index.html
index 1df8d988fe..41f5fc671e 100644
--- a/polygerrit-ui/app/test/index.html
+++ b/polygerrit-ui/app/test/index.html
@@ -32,7 +32,6 @@ limitations under the License.
     'gr-app_test.html',
     'admin/gr-access-section/gr-access-section_test.html',
     'admin/gr-admin-group-list/gr-admin-group-list_test.html',
-    'admin/gr-admin-project-list/gr-admin-project-list_test.html',
     'admin/gr-admin-view/gr-admin-view_test.html',
     'admin/gr-confirm-delete-item-dialog/gr-confirm-delete-item-dialog_test.html',
     'admin/gr-create-change-dialog/gr-create-change-dialog_test.html',
@@ -48,6 +47,7 @@ limitations under the License.
     'admin/gr-project-access/gr-project-access_test.html',
     'admin/gr-project-commands/gr-project-commands_test.html',
     'admin/gr-project-detail-list/gr-project-detail-list_test.html',
+    'admin/gr-project-list/gr-project-list_test.html',
     'admin/gr-rule-editor/gr-rule-editor_test.html',
     'change-list/gr-change-list-item/gr-change-list-item_test.html',
     'change-list/gr-change-list-view/gr-change-list-view_test.html',