diff --git a/ui/src/admin/components/chronograf/OrganizationsTable.js b/ui/src/admin/components/chronograf/OrganizationsTable.js
index fdb53776d..ebfbcb6ab 100644
--- a/ui/src/admin/components/chronograf/OrganizationsTable.js
+++ b/ui/src/admin/components/chronograf/OrganizationsTable.js
@@ -2,9 +2,9 @@ import React, {Component, PropTypes} from 'react'
 
 import uuid from 'node-uuid'
 
-import Organization from 'src/admin/components/chronograf/Organization'
-import DefaultOrganization from 'src/admin/components/chronograf/DefaultOrganization'
-import NewOrganization from 'src/admin/components/chronograf/NewOrganization'
+import OrganizationsTableRow from 'src/admin/components/chronograf/OrganizationsTableRow'
+import OrganizationsTableRowDefault from 'src/admin/components/chronograf/OrganizationsTableRowDefault'
+import OrganizationsTableRowNew from 'src/admin/components/chronograf/OrganizationsTableRowNew'
 
 import {DEFAULT_ORG_ID} from 'src/admin/constants/dummyUsers'
 
@@ -64,7 +64,7 @@ class OrganizationsTable extends Component {
                   <div className="orgs-table--delete" />
                 </div>
                 {isCreatingOrganization
-                  ? <NewOrganization
+                  ? <OrganizationsTableRowNew
                       onCreateOrganization={this.handleCreateOrganization}
                       onCancelCreateOrganization={
                         this.handleCancelCreateOrganization
@@ -74,11 +74,11 @@ class OrganizationsTable extends Component {
                 {organizations.map(
                   org =>
                     org.id === DEFAULT_ORG_ID
-                      ? <DefaultOrganization
+                      ? <OrganizationsTableRowDefault
                           key={uuid.v4()}
                           organization={org}
                         />
-                      : <Organization
+                      : <OrganizationsTableRow
                           key={uuid.v4()}
                           organization={org}
                           onDelete={onDeleteOrg}
diff --git a/ui/src/admin/components/chronograf/Organization.js b/ui/src/admin/components/chronograf/OrganizationsTableRow.js
similarity index 96%
rename from ui/src/admin/components/chronograf/Organization.js
rename to ui/src/admin/components/chronograf/OrganizationsTableRow.js
index c4221a958..5e7da702d 100644
--- a/ui/src/admin/components/chronograf/Organization.js
+++ b/ui/src/admin/components/chronograf/OrganizationsTableRow.js
@@ -6,7 +6,7 @@ import Dropdown from 'shared/components/Dropdown'
 import {USER_ROLES} from 'src/admin/constants/dummyUsers'
 import {MEMBER_ROLE} from 'src/auth/Authorized'
 
-class Organization extends Component {
+class OrganizationsTableRow extends Component {
   constructor(props) {
     super(props)
 
@@ -129,7 +129,7 @@ class Organization extends Component {
 
 const {func, shape, string} = PropTypes
 
-Organization.propTypes = {
+OrganizationsTableRow.propTypes = {
   organization: shape({
     id: string, // when optimistically created, organization will not have an id
     name: string.isRequired,
@@ -138,4 +138,4 @@ Organization.propTypes = {
   onRename: func.isRequired,
 }
 
-export default Organization
+export default OrganizationsTableRow
diff --git a/ui/src/admin/components/chronograf/DefaultOrganization.js b/ui/src/admin/components/chronograf/OrganizationsTableRowDefault.js
similarity index 83%
rename from ui/src/admin/components/chronograf/DefaultOrganization.js
rename to ui/src/admin/components/chronograf/OrganizationsTableRowDefault.js
index 93f4a32f9..2c44fb963 100644
--- a/ui/src/admin/components/chronograf/DefaultOrganization.js
+++ b/ui/src/admin/components/chronograf/OrganizationsTableRowDefault.js
@@ -3,7 +3,7 @@ import React, {PropTypes} from 'react'
 import {MEMBER_ROLE} from 'src/auth/Authorized'
 
 // This is a non-editable organization row, used currently for DEFAULT_ORG
-const DefaultOrganization = ({organization}) =>
+const OrganizationsTableRowDefault = ({organization}) =>
   <div className="orgs-table--org">
     <div className="orgs-table--id">
       {organization.id}
@@ -24,11 +24,11 @@ const DefaultOrganization = ({organization}) =>
 
 const {shape, string} = PropTypes
 
-DefaultOrganization.propTypes = {
+OrganizationsTableRowDefault.propTypes = {
   organization: shape({
     id: string,
     name: string.isRequired,
   }).isRequired,
 }
 
-export default DefaultOrganization
+export default OrganizationsTableRowDefault
diff --git a/ui/src/admin/components/chronograf/NewOrganization.js b/ui/src/admin/components/chronograf/OrganizationsTableRowNew.js
similarity index 94%
rename from ui/src/admin/components/chronograf/NewOrganization.js
rename to ui/src/admin/components/chronograf/OrganizationsTableRowNew.js
index 7774abc90..f67a40e0d 100644
--- a/ui/src/admin/components/chronograf/NewOrganization.js
+++ b/ui/src/admin/components/chronograf/OrganizationsTableRowNew.js
@@ -6,7 +6,7 @@ import Dropdown from 'shared/components/Dropdown'
 import {USER_ROLES} from 'src/admin/constants/dummyUsers'
 import {MEMBER_ROLE} from 'src/auth/Authorized'
 
-class NewOrganization extends Component {
+class OrganizationsTableRowNew extends Component {
   constructor(props) {
     super(props)
 
@@ -91,9 +91,9 @@ class NewOrganization extends Component {
 
 const {func} = PropTypes
 
-NewOrganization.propTypes = {
+OrganizationsTableRowNew.propTypes = {
   onCreateOrganization: func.isRequired,
   onCancelCreateOrganization: func.isRequired,
 }
 
-export default NewOrganization
+export default OrganizationsTableRowNew
diff --git a/ui/src/admin/components/chronograf/UsersTable.js b/ui/src/admin/components/chronograf/UsersTable.js
index c202c7ef3..795a14481 100644
--- a/ui/src/admin/components/chronograf/UsersTable.js
+++ b/ui/src/admin/components/chronograf/UsersTable.js
@@ -5,8 +5,8 @@ import uuid from 'node-uuid'
 import Authorized, {SUPERADMIN_ROLE} from 'src/auth/Authorized'
 
 import UsersTableHeader from 'src/admin/components/chronograf/UsersTableHeader'
-import OrgTableRow from 'src/admin/components/chronograf/OrgTableRow'
-import NewUserTableRow from 'src/admin/components/chronograf/NewUserTableRow'
+import UsersTableRowNew from 'src/admin/components/chronograf/UsersTableRowNew'
+import UsersTableRow from 'src/admin/components/chronograf/UsersTableRow'
 
 import {USERS_TABLE} from 'src/admin/constants/chronografTableSizing'
 
@@ -74,7 +74,7 @@ class UsersTable extends Component {
             </thead>
             <tbody>
               {isCreatingUser
-                ? <NewUserTableRow
+                ? <UsersTableRowNew
                     organization={organization}
                     onBlur={this.handleBlurCreateUserRow}
                     onCreateUser={onCreateUser}
@@ -82,7 +82,7 @@ class UsersTable extends Component {
                 : null}
               {users.length || !isCreatingUser
                 ? users.map(user =>
-                    <OrgTableRow
+                    <UsersTableRow
                       user={user}
                       key={uuid.v4()}
                       organization={organization}
diff --git a/ui/src/admin/components/chronograf/OrgTableRow.js b/ui/src/admin/components/chronograf/UsersTableRow.js
similarity index 96%
rename from ui/src/admin/components/chronograf/OrgTableRow.js
rename to ui/src/admin/components/chronograf/UsersTableRow.js
index 68980830e..b6c7121be 100644
--- a/ui/src/admin/components/chronograf/OrgTableRow.js
+++ b/ui/src/admin/components/chronograf/UsersTableRow.js
@@ -8,7 +8,7 @@ import SlideToggle from 'shared/components/SlideToggle'
 import {USER_ROLES} from 'src/admin/constants/dummyUsers'
 import {USERS_TABLE} from 'src/admin/constants/chronografTableSizing'
 
-const OrgTableRow = ({
+const UsersTableRow = ({
   user,
   organization,
   onChangeUserRole,
@@ -71,7 +71,7 @@ const OrgTableRow = ({
 
 const {func, shape, string} = PropTypes
 
-OrgTableRow.propTypes = {
+UsersTableRow.propTypes = {
   user: shape(),
   organization: shape({
     name: string.isRequired,
@@ -81,4 +81,4 @@ OrgTableRow.propTypes = {
   onChangeSuperAdmin: func.isRequired,
 }
 
-export default OrgTableRow
+export default UsersTableRow
diff --git a/ui/src/admin/components/chronograf/NewUserTableRow.js b/ui/src/admin/components/chronograf/UsersTableRowNew.js
similarity index 97%
rename from ui/src/admin/components/chronograf/NewUserTableRow.js
rename to ui/src/admin/components/chronograf/UsersTableRowNew.js
index c9bede85b..db7901a10 100644
--- a/ui/src/admin/components/chronograf/NewUserTableRow.js
+++ b/ui/src/admin/components/chronograf/UsersTableRowNew.js
@@ -9,7 +9,7 @@ import {USERS_TABLE} from 'src/admin/constants/chronografTableSizing'
 import {USER_ROLES} from 'src/admin/constants/dummyUsers'
 import {MEMBER_ROLE} from 'src/auth/Authorized'
 
-class NewUserTableRow extends Component {
+class UsersTableRowNew extends Component {
   constructor(props) {
     super(props)
 
@@ -141,7 +141,7 @@ class NewUserTableRow extends Component {
 
 const {func, shape, string} = PropTypes
 
-NewUserTableRow.propTypes = {
+UsersTableRowNew.propTypes = {
   organization: shape({
     id: string.isRequired,
     name: string.isRequired,
@@ -150,4 +150,4 @@ NewUserTableRow.propTypes = {
   onCreateUser: func.isRequired,
 }
 
-export default NewUserTableRow
+export default UsersTableRowNew