diff --git a/public/app/core/components/user_group_picker.ts b/public/app/core/components/team_picker.ts
similarity index 100%
rename from public/app/core/components/user_group_picker.ts
rename to public/app/core/components/team_picker.ts
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 08dabc67310..f43f4df3110 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -47,7 +47,7 @@ import {helpModal} from './components/help/help';
 import {JsonExplorer} from './components/json_explorer/json_explorer';
 import {NavModelSrv, NavModel} from './nav_model_srv';
 import {userPicker} from './components/user_picker';
-import {teamPicker} from './components/user_group_picker';
+import {teamPicker} from './components/team_picker';
 import {geminiScrollbar} from './components/scroll/scroll';
 import {gfPageDirective} from './components/gf_page';
 import {orgSwitcher} from './components/org_switcher';
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 92f812f3d62..f2527f14e16 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -110,13 +110,13 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
     resolve: loadOrgBundle,
   })
   .when('/org/teams', {
-    templateUrl: 'public/app/features/org/partials/user_groups.html',
+    templateUrl: 'public/app/features/org/partials/teams.html',
     controller : 'TeamsCtrl',
     controllerAs: 'ctrl',
     resolve: loadOrgBundle,
   })
   .when('/org/teams/edit/:id', {
-    templateUrl: 'public/app/features/org/partials/user_group_details.html',
+    templateUrl: 'public/app/features/org/partials/team_details.html',
     controller : 'TeamDetailsCtrl',
     controllerAs: 'ctrl',
     resolve: loadOrgBundle,
diff --git a/public/app/features/org/all.ts b/public/app/features/org/all.ts
index 2b60fc518c7..11a362d728a 100644
--- a/public/app/features/org/all.ts
+++ b/public/app/features/org/all.ts
@@ -5,9 +5,9 @@ import './select_org_ctrl';
 import './change_password_ctrl';
 import './new_org_ctrl';
 import './user_invite_ctrl';
-import './user_groups_ctrl';
-import './user_group_details_ctrl';
-import './create_user_group_modal';
+import './teams_ctrl';
+import './team_details_ctrl';
+import './create_team_modal';
 import './org_api_keys_ctrl';
 import './org_details_ctrl';
 import './prefs_control';
diff --git a/public/app/features/org/create_user_group_modal.ts b/public/app/features/org/create_team_modal.ts
similarity index 91%
rename from public/app/features/org/create_user_group_modal.ts
rename to public/app/features/org/create_team_modal.ts
index 224a11f4e41..8c82dbf3d9f 100644
--- a/public/app/features/org/create_user_group_modal.ts
+++ b/public/app/features/org/create_team_modal.ts
@@ -27,7 +27,7 @@ export class CreateTeamCtrl {
 export function createTeamModal() {
   return {
     restrict: 'E',
-    templateUrl: 'public/app/features/org/partials/create_user_group.html',
+    templateUrl: 'public/app/features/org/partials/create_team.html',
     controller: CreateTeamCtrl,
     bindToController: true,
     controllerAs: 'ctrl',
diff --git a/public/app/features/org/partials/create_user_group.html b/public/app/features/org/partials/create_team.html
similarity index 100%
rename from public/app/features/org/partials/create_user_group.html
rename to public/app/features/org/partials/create_team.html
diff --git a/public/app/features/org/partials/user_group_details.html b/public/app/features/org/partials/team_details.html
similarity index 100%
rename from public/app/features/org/partials/user_group_details.html
rename to public/app/features/org/partials/team_details.html
diff --git a/public/app/features/org/partials/user_groups.html b/public/app/features/org/partials/teams.html
similarity index 100%
rename from public/app/features/org/partials/user_groups.html
rename to public/app/features/org/partials/teams.html
diff --git a/public/app/features/org/specs/user_group_details_ctrl_specs.ts b/public/app/features/org/specs/team_details_ctrl_specs.ts
similarity index 93%
rename from public/app/features/org/specs/user_group_details_ctrl_specs.ts
rename to public/app/features/org/specs/team_details_ctrl_specs.ts
index 06087e8a05a..84e37bee7e6 100644
--- a/public/app/features/org/specs/user_group_details_ctrl_specs.ts
+++ b/public/app/features/org/specs/team_details_ctrl_specs.ts
@@ -1,6 +1,6 @@
-import '../user_group_details_ctrl';
+import '../team_details_ctrl';
 import {describe, beforeEach, it, expect, sinon, angularMocks} from 'test/lib/common';
-import TeamDetailsCtrl from '../user_group_details_ctrl';
+import TeamDetailsCtrl from '../team_details_ctrl';
 
 describe('TeamDetailsCtrl', () => {
 var ctx: any = {};
diff --git a/public/app/features/org/user_group_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts
similarity index 100%
rename from public/app/features/org/user_group_details_ctrl.ts
rename to public/app/features/org/team_details_ctrl.ts
diff --git a/public/app/features/org/user_groups_ctrl.ts b/public/app/features/org/teams_ctrl.ts
similarity index 100%
rename from public/app/features/org/user_groups_ctrl.ts
rename to public/app/features/org/teams_ctrl.ts
diff --git a/public/img/icons_dark_theme/icon_user_group.svg b/public/img/icons_dark_theme/icon_team.svg
similarity index 100%
rename from public/img/icons_dark_theme/icon_user_group.svg
rename to public/img/icons_dark_theme/icon_team.svg
diff --git a/public/img/icons_light_theme/icon_user_group.svg b/public/img/icons_light_theme/icon_team.svg
similarity index 100%
rename from public/img/icons_light_theme/icon_user_group.svg
rename to public/img/icons_light_theme/icon_team.svg
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index 60447fa61a1..5ede8cff740 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -52,7 +52,7 @@
 }
 
 .gicon-team {
-  background-image: url('../img/icons_#{$theme-name}_theme/icon_user_group.svg');
+  background-image: url('../img/icons_#{$theme-name}_theme/icon_team.svg');
 }
 
 .gicon-org {