diff --git a/pkg/api/user_group.go b/pkg/api/team.go
similarity index 100%
rename from pkg/api/user_group.go
rename to pkg/api/team.go
diff --git a/pkg/api/user_group_members.go b/pkg/api/team_members.go
similarity index 100%
rename from pkg/api/user_group_members.go
rename to pkg/api/team_members.go
diff --git a/pkg/api/user_group_test.go b/pkg/api/team_test.go
similarity index 100%
rename from pkg/api/user_group_test.go
rename to pkg/api/team_test.go
diff --git a/pkg/models/user_group.go b/pkg/models/team.go
similarity index 100%
rename from pkg/models/user_group.go
rename to pkg/models/team.go
diff --git a/pkg/models/user_group_member.go b/pkg/models/team_member.go
similarity index 100%
rename from pkg/models/user_group_member.go
rename to pkg/models/team_member.go
diff --git a/pkg/services/sqlstore/migrations/user_group_mig.go b/pkg/services/sqlstore/migrations/team_mig.go
similarity index 100%
rename from pkg/services/sqlstore/migrations/user_group_mig.go
rename to pkg/services/sqlstore/migrations/team_mig.go
diff --git a/pkg/services/sqlstore/user_group.go b/pkg/services/sqlstore/team.go
similarity index 100%
rename from pkg/services/sqlstore/user_group.go
rename to pkg/services/sqlstore/team.go
diff --git a/pkg/services/sqlstore/user_group_test.go b/pkg/services/sqlstore/team_test.go
similarity index 100%
rename from pkg/services/sqlstore/user_group_test.go
rename to pkg/services/sqlstore/team_test.go