From e9fb489288626263ac61416b0cca3f8777ac09d0 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 1 Jul 2022 14:43:16 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9B=20:=20rename=20Team=20to=20Organiz?=
 =?UTF-8?q?ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/app/pages/dashboard/dashboard.vue  |  8 ++--
 src/main/client/app/pages/modules/module.vue  | 14 +++---
 .../client/app/pages/users/organizations.vue  |  8 ++--
 src/main/client/app/pages/users/user-edit.vue | 16 +++----
 src/main/client/app/pages/users/user-new.vue  | 16 +++----
 src/main/client/app/pages/users/users.vue     |  8 ++--
 .../app/shared/api/organizations-api.js       |  7 +++
 src/main/client/app/shared/api/teams-api.js   |  7 ---
 .../AuthenticationRestController.kt           |  2 +-
 .../config/SpringSecurityUserAuditorAware.kt  |  4 +-
 .../config/security/AuthenticationHandler.kt  |  4 +-
 .../config/security/SecurityConfig.kt         |  4 +-
 .../security/oauth2/OAuth2SuccessHandler.kt   |  6 +--
 .../io/gaia_app/credentials/Credentials.kt    |  2 +-
 .../credentials/CredentialsRepository.kt      |  2 +-
 .../CredentialsRestController.java            |  2 +-
 .../credentials/CredentialsService.kt         |  2 +-
 .../controller/DashboardRestController.kt     | 14 +++---
 .../io/gaia_app/modules/bo/ModuleMetadata.kt  |  2 +-
 .../gaia_app/modules/bo/TerraformModule.java  | 16 +++----
 .../controller/ModuleRestController.java      |  6 +--
 .../repository/TerraformModuleRepository.kt   |  8 ++--
 .../AdminUserInitialization.java              |  2 +-
 .../{teams => organizations}/UserService.kt   |  4 +-
 .../gaia_app/{teams => organizations}/bo.kt   |  8 ++--
 .../OrganizationsRestController.java          | 39 ++++++++++++++++
 .../controller/UserControllerAdvice.java      | 12 ++---
 .../controller/UsersRestController.java       |  6 +--
 .../repository/OrganizationsRepository.java   |  9 ++++
 .../repository/UserRepository.kt              |  4 +-
 .../registries/AbstractRegistryApi.kt         |  2 +-
 .../io/gaia_app/registries/RegistryApi.kt     |  2 +-
 .../registries/RegistryOAuth2Provider.java    |  2 +-
 .../controller/GithubRegistryController.kt    |  2 +-
 .../controller/GitlabRegistryController.kt    |  2 +-
 .../registries/service/RegistryService.kt     |  2 +-
 src/main/java/io/gaia_app/stacks/bo/Job.java  |  2 +-
 .../java/io/gaia_app/stacks/bo/Stack.java     | 14 +++---
 .../controller/StackRestController.java       | 16 +++----
 .../stacks/repository/StackRepository.kt      | 12 ++---
 .../teams/controller/TeamsRestController.java | 39 ----------------
 .../teams/repository/TeamRepository.java      |  9 ----
 .../gaia_app/vault/VaultCredentialsService.kt |  2 +-
 .../AuthenticationRestControllerIT.kt         |  4 +-
 .../AuthenticationRestControllerTest.kt       |  2 +-
 .../security/AuthenticationHandlerTest.kt     |  6 +--
 .../config/security/SecurityConfigIT.kt       |  5 +--
 .../oauth2/OAuth2SuccessHandlerTest.kt        |  8 ++--
 .../CredentialsRestControllerIT.java          |  2 +-
 .../CredentialsRestControllerVaultIT.java     |  2 +-
 .../PlainCredentialsServiceTest.kt            |  2 +-
 .../controller/DashboardRestControllerTest.kt | 28 ++++++------
 .../e2e/CucumberContextConfiguration.java     |  2 +-
 .../modules/bo/TerraformModuleTest.java       | 16 +++----
 .../controller/ModuleRestControllerIT.java    | 12 ++---
 .../controller/ModuleRestControllerTest.java  | 22 +++++-----
 .../TerraformModuleRepositoryIT.java          | 14 +++---
 .../AdminUserInitializationTest.kt            |  8 +---
 .../OrganizationsRestControllerIT.java}       | 44 +++++++++----------
 .../OrganizationsRestControllerTest.java      | 39 ++++++++++++++++
 .../controller/UserControllerAdviceTest.java  | 18 ++++----
 .../controller/UsersRestControllerIT.java     | 28 ++++++------
 .../controller/UsersRestControllerTest.java   |  6 +--
 .../repository/UserRepositoryIT.kt            |  8 ++--
 .../controller/GithubRegistryControllerIT.kt  |  4 +-
 .../GithubRegistryControllerTest.kt           |  2 +-
 .../controller/GitlabRegistryControllerIT.kt  |  4 +-
 .../GitlabRegistryControllerTest.kt           |  2 +-
 .../github/GitHubRawContentTest.java          |  4 +-
 .../github/GithubRegistryApiTest.kt           |  4 +-
 .../gitlab/GitLabRawContentTest.java          |  4 +-
 .../gitlab/GitlabRegistryApiTest.kt           |  4 +-
 .../service/RegistryServiceImplTest.kt        |  2 +-
 .../runner/RunnerCommandBuilderTest.java      |  4 +-
 .../gaia_app/runner/RunnerControllerIT.java   |  2 +-
 .../java/io/gaia_app/stacks/bo/JobTest.java   |  2 +-
 .../controller/StackRestControllerIT.java     | 16 +++----
 .../controller/StackRestControllerTest.java   | 38 ++++++++--------
 .../stacks/repository/StackRepositoryIT.java  | 28 ++++++------
 .../controller/TeamsRestControllerTest.java   | 39 ----------------
 src/test/resources/db/00_organization.js      | 13 ++++++
 src/test/resources/db/00_team.js              | 13 ------
 src/test/resources/db/10_user.js              |  4 +-
 src/test/resources/db/20_module.js            |  8 ++--
 src/test/resources/db/30_stack.js             |  8 ++--
 .../rest/github/selmak-public-repos.json      |  8 ++--
 .../github/selmak-terraform-docker-mongo.json |  4 +-
 87 files changed, 417 insertions(+), 424 deletions(-)
 create mode 100644 src/main/client/app/shared/api/organizations-api.js
 delete mode 100644 src/main/client/app/shared/api/teams-api.js
 rename src/main/java/io/gaia_app/{teams => organizations}/AdminUserInitialization.java (97%)
 rename src/main/java/io/gaia_app/{teams => organizations}/UserService.kt (94%)
 rename src/main/java/io/gaia_app/{teams => organizations}/bo.kt (80%)
 create mode 100644 src/main/java/io/gaia_app/organizations/controller/OrganizationsRestController.java
 rename src/main/java/io/gaia_app/{teams => organizations}/controller/UserControllerAdvice.java (77%)
 rename src/main/java/io/gaia_app/{teams => organizations}/controller/UsersRestController.java (89%)
 create mode 100644 src/main/java/io/gaia_app/organizations/repository/OrganizationsRepository.java
 rename src/main/java/io/gaia_app/{teams => organizations}/repository/UserRepository.kt (69%)
 delete mode 100644 src/main/java/io/gaia_app/teams/controller/TeamsRestController.java
 delete mode 100644 src/main/java/io/gaia_app/teams/repository/TeamRepository.java
 rename src/test/java/io/gaia_app/{teams => organizations}/AdminUserInitializationTest.kt (86%)
 rename src/test/java/io/gaia_app/{teams/controller/TeamsRestControllerIT.java => organizations/controller/OrganizationsRestControllerIT.java} (60%)
 create mode 100644 src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerTest.java
 rename src/test/java/io/gaia_app/{teams => organizations}/controller/UserControllerAdviceTest.java (73%)
 rename src/test/java/io/gaia_app/{teams => organizations}/controller/UsersRestControllerIT.java (88%)
 rename src/test/java/io/gaia_app/{teams => organizations}/controller/UsersRestControllerTest.java (90%)
 rename src/test/java/io/gaia_app/{teams => organizations}/repository/UserRepositoryIT.kt (79%)
 delete mode 100644 src/test/java/io/gaia_app/teams/controller/TeamsRestControllerTest.java
 create mode 100644 src/test/resources/db/00_organization.js
 delete mode 100644 src/test/resources/db/00_team.js

diff --git a/src/main/client/app/pages/dashboard/dashboard.vue b/src/main/client/app/pages/dashboard/dashboard.vue
index b55d27844..ccab4021f 100644
--- a/src/main/client/app/pages/dashboard/dashboard.vue
+++ b/src/main/client/app/pages/dashboard/dashboard.vue
@@ -36,7 +36,7 @@
       </div>
     </div>
     <div
-      v-if="isWithoutTeam"
+      v-if="isWithoutOrganization"
       class="center"
     >
       <div class="error_page">
@@ -49,7 +49,7 @@
         </div>
         <br>
         <h3>Hi there !</h3>
-        <p>It seems that you're not a member of a team yet. Ask your admin to add you a team !</p>
+        <p>It seems that you're not a member of a organization yet. Ask your admin to add you a organization !</p>
         <p>Until then, you'll only be able to use public modules.</p>
       </div>
     </div>
@@ -72,8 +72,8 @@
     }),
     computed: {
       ...mapState('session', ['user']),
-      isWithoutTeam() {
-        return !this.user.admin && !this.user.team;
+      isWithoutOrganization() {
+        return !this.user.admin && !this.user.organization;
       },
     },
     async created() {
diff --git a/src/main/client/app/pages/modules/module.vue b/src/main/client/app/pages/modules/module.vue
index 5a3e946b7..36cd24c57 100644
--- a/src/main/client/app/pages/modules/module.vue
+++ b/src/main/client/app/pages/modules/module.vue
@@ -97,19 +97,19 @@
 
         <hr>
 
-        <h2>Authorized Teams</h2>
+        <h2>Authorized Organizations</h2>
 
         <b-form-row>
           <b-col cols="6">
             <b-form-group>
               <vue-multiselect
-                v-model="module.authorizedTeams"
+                v-model="module.authorizedOrganizations"
                 :multiple="true"
                 label="id"
                 track-by="id"
                 searchable
-                placeholder="Select teams"
-                :options="teams"
+                placeholder="Select organizations"
+                :options="organizations"
               />
             </b-form-group>
           </b-col>
@@ -164,7 +164,7 @@
     refreshModule,
     updateModule,
   } from '@/shared/api/modules-api';
-  import { getTeams } from '@/shared/api/teams-api';
+  import { getOrganizations } from '@/shared/api/organizations-api';
   import {
     displayConfirmDialog,
     displayNotification,
@@ -190,7 +190,7 @@
         module: null,
         isTerraformImageValid: null,
         isTerraformImageOverride: null,
-        teams: [],
+        organizations: [],
         providers: [
           { value: 'aws', text: 'AWS' },
           { value: 'azurerm', text: 'Azure' },
@@ -210,7 +210,7 @@
 
     async created() {
       this.module = await getModule(this.moduleId);
-      this.teams = await getTeams();
+      this.organizations = await getOrganizations();
     },
 
     methods: {
diff --git a/src/main/client/app/pages/users/organizations.vue b/src/main/client/app/pages/users/organizations.vue
index 1f3c199e6..dc2ca2fee 100644
--- a/src/main/client/app/pages/users/organizations.vue
+++ b/src/main/client/app/pages/users/organizations.vue
@@ -28,7 +28,7 @@
 
     <div class="block mt-3">
       <b-table
-        :items="teams"
+        :items="organizations"
         :fields="fields"
         striped
         fixed
@@ -52,13 +52,13 @@
 </template>
 
 <script>
-  import { createOrganization, deleteOrganization, getTeams } from '@/shared/api/teams-api';
+  import { createOrganization, deleteOrganization, getOrganizations } from '@/shared/api/organizations-api';
   import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppOrganizations',
     data: () => ({
-      teams: [],
+      organizations: [],
       newOrganizationName: '',
       fields: [
         { key: 'id', label: 'Name', sortable: true },
@@ -70,7 +70,7 @@
     },
     methods: {
       async refresh() {
-        this.teams = await getTeams();
+        this.organizations = await getOrganizations();
       },
       async createOrg() {
         await createOrganization({ id: this.newOrganizationName })
diff --git a/src/main/client/app/pages/users/user-edit.vue b/src/main/client/app/pages/users/user-edit.vue
index 005fcf95b..9d245c444 100644
--- a/src/main/client/app/pages/users/user-edit.vue
+++ b/src/main/client/app/pages/users/user-edit.vue
@@ -16,16 +16,16 @@
           </b-form-group>
 
           <b-form-group
-            label="Team"
-            description="The user team"
+            label="Organization"
+            description="The user organization"
           >
             <vue-multiselect
-              v-model="user.team"
-              :options="teams"
+              v-model="user.organization"
+              :options="organizations"
               track-by="id"
               label="id"
               :multiple="false"
-              placeholder="Select user team"
+              placeholder="Select user organization"
               :show-labels="false"
             />
           </b-form-group>
@@ -131,7 +131,7 @@
 </template>
 
 <script>
-  import { getTeams } from '@/shared/api/teams-api';
+  import { getOrganizations } from '@/shared/api/organizations-api';
   import { changeUserPassword, deleteUser, updateUser } from '@/shared/api/users-api';
   import { displayNotification } from '@/shared/services/modal-service';
 
@@ -150,10 +150,10 @@
       },
     },
     data: () => ({
-      teams: [],
+      organizations: [],
     }),
     async created() {
-      this.teams = await getTeams();
+      this.organizations = await getOrganizations();
     },
     methods: {
       async redirectToUsersPage() {
diff --git a/src/main/client/app/pages/users/user-new.vue b/src/main/client/app/pages/users/user-new.vue
index c870b12e2..4c06ca554 100644
--- a/src/main/client/app/pages/users/user-new.vue
+++ b/src/main/client/app/pages/users/user-new.vue
@@ -36,16 +36,16 @@
         </b-form-group>
 
         <b-form-group
-          label="Team"
-          description="The user team"
+          label="Organization"
+          description="The user organization"
         >
           <vue-multiselect
-            v-model="user.team"
-            :options="teams"
+            v-model="user.organization"
+            :options="organizations"
             track-by="id"
             label="id"
             :multiple="false"
-            placeholder="Select user team"
+            placeholder="Select user organization"
             :show-labels="false"
           />
         </b-form-group>
@@ -79,18 +79,18 @@
 </template>
 
 <script>
-  import { getTeams } from '@/shared/api/teams-api';
+  import { getOrganizations } from '@/shared/api/organizations-api';
   import { createUser } from '@/shared/api/users-api';
   import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppUserEdition',
     data: () => ({
-      teams: [],
+      organizations: [],
       user: {},
     }),
     async created() {
-      this.teams = await getTeams();
+      this.organizations = await getOrganizations();
     },
     methods: {
       async createUser() {
diff --git a/src/main/client/app/pages/users/users.vue b/src/main/client/app/pages/users/users.vue
index 40744a661..dc0b93813 100644
--- a/src/main/client/app/pages/users/users.vue
+++ b/src/main/client/app/pages/users/users.vue
@@ -47,7 +47,7 @@
     getUsers,
     updateUser,
   } from '@/shared/api/users-api';
-  import { getTeams } from '@/shared/api/teams-api';
+  import { getOrganizations } from '@/shared/api/organizations-api';
   import { displayNotification } from '@/shared/services/modal-service';
   import AppUserName from '@/pages/users/user-name.vue';
 
@@ -55,16 +55,16 @@
     name: 'AppUsers',
     components: { AppUserName },
     data: () => ({
-      teams: [],
+      organizations: [],
       users: [],
       fields: [
         { key: 'username', label: 'User', sortable: true },
-        { key: 'team.id', label: 'Team', sortable: true },
+        { key: 'organization.id', label: 'Organization', sortable: true },
         { key: 'edit' },
       ],
     }),
     async created() {
-      [this.users, this.teams] = await Promise.all([getUsers(), getTeams()]);
+      [this.users, this.organizations] = await Promise.all([getUsers(), getOrganizations()]);
     },
     methods: {
       saveUser(user) {
diff --git a/src/main/client/app/shared/api/organizations-api.js b/src/main/client/app/shared/api/organizations-api.js
new file mode 100644
index 000000000..b2f68ddc8
--- /dev/null
+++ b/src/main/client/app/shared/api/organizations-api.js
@@ -0,0 +1,7 @@
+import axios from 'axios';
+
+export const getOrganizations = async () => axios.get('/api/organizations');
+
+export const deleteOrganization = async (organizationId) => axios.delete(`/api/organizations/${organizationId}`);
+
+export const createOrganization = async (organization) => axios.post('/api/organizations', organization);
diff --git a/src/main/client/app/shared/api/teams-api.js b/src/main/client/app/shared/api/teams-api.js
deleted file mode 100644
index 0a349b55a..000000000
--- a/src/main/client/app/shared/api/teams-api.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import axios from 'axios';
-
-export const getTeams = async () => axios.get('/api/teams');
-
-export const deleteOrganization = async (organizationId) => axios.delete(`/api/teams/${organizationId}`);
-
-export const createOrganization = async (organization) => axios.post('/api/teams', organization);
diff --git a/src/main/java/io/gaia_app/client/controller/AuthenticationRestController.kt b/src/main/java/io/gaia_app/client/controller/AuthenticationRestController.kt
index 52a1072b3..6ddf5b02d 100644
--- a/src/main/java/io/gaia_app/client/controller/AuthenticationRestController.kt
+++ b/src/main/java/io/gaia_app/client/controller/AuthenticationRestController.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.client.controller
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
 import org.springframework.security.core.Authentication
diff --git a/src/main/java/io/gaia_app/config/SpringSecurityUserAuditorAware.kt b/src/main/java/io/gaia_app/config/SpringSecurityUserAuditorAware.kt
index b5a63fe9f..667fd4034 100644
--- a/src/main/java/io/gaia_app/config/SpringSecurityUserAuditorAware.kt
+++ b/src/main/java/io/gaia_app/config/SpringSecurityUserAuditorAware.kt
@@ -1,7 +1,7 @@
 package io.gaia_app.config
 
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import org.springframework.data.domain.AuditorAware
 import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.stereotype.Component
diff --git a/src/main/java/io/gaia_app/config/security/AuthenticationHandler.kt b/src/main/java/io/gaia_app/config/security/AuthenticationHandler.kt
index 89e772e23..09647ff72 100644
--- a/src/main/java/io/gaia_app/config/security/AuthenticationHandler.kt
+++ b/src/main/java/io/gaia_app/config/security/AuthenticationHandler.kt
@@ -1,8 +1,8 @@
 package io.gaia_app.config.security
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import org.springframework.http.MediaType
 import org.springframework.security.access.AccessDeniedException
 import org.springframework.security.core.Authentication
diff --git a/src/main/java/io/gaia_app/config/security/SecurityConfig.kt b/src/main/java/io/gaia_app/config/security/SecurityConfig.kt
index 2a823649a..baad050fc 100644
--- a/src/main/java/io/gaia_app/config/security/SecurityConfig.kt
+++ b/src/main/java/io/gaia_app/config/security/SecurityConfig.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.config.security
 
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.repository.UserRepository
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -90,7 +90,7 @@ class SecurityConfig(
 
 }
 
-fun io.gaia_app.teams.User.toAuthorities(): List<GrantedAuthority> {
+fun io.gaia_app.organizations.User.toAuthorities(): List<GrantedAuthority> {
     return if (this.isAdmin) {
         listOf(SimpleGrantedAuthority("ROLE_ADMIN"), SimpleGrantedAuthority("ROLE_USER"))
     } else {
diff --git a/src/main/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandler.kt b/src/main/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandler.kt
index 65c1398fe..533cb79c9 100644
--- a/src/main/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandler.kt
+++ b/src/main/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandler.kt
@@ -2,9 +2,9 @@ package io.gaia_app.config.security.oauth2
 
 import io.gaia_app.config.security.SuccessHandler
 import io.gaia_app.registries.RegistryOAuth2Provider
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition
 import org.springframework.context.annotation.Conditional
 import org.springframework.security.core.Authentication
diff --git a/src/main/java/io/gaia_app/credentials/Credentials.kt b/src/main/java/io/gaia_app/credentials/Credentials.kt
index ad71a7759..54558dbff 100644
--- a/src/main/java/io/gaia_app/credentials/Credentials.kt
+++ b/src/main/java/io/gaia_app/credentials/Credentials.kt
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.data.annotation.CreatedBy
 import org.springframework.data.annotation.Id
 import org.springframework.data.mongodb.core.mapping.DBRef
diff --git a/src/main/java/io/gaia_app/credentials/CredentialsRepository.kt b/src/main/java/io/gaia_app/credentials/CredentialsRepository.kt
index 151b2faa4..b2c8b4ae4 100644
--- a/src/main/java/io/gaia_app/credentials/CredentialsRepository.kt
+++ b/src/main/java/io/gaia_app/credentials/CredentialsRepository.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.credentials
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.data.mongodb.repository.MongoRepository
 import java.util.*
 
diff --git a/src/main/java/io/gaia_app/credentials/CredentialsRestController.java b/src/main/java/io/gaia_app/credentials/CredentialsRestController.java
index a117a2bf1..38b7d5951 100644
--- a/src/main/java/io/gaia_app/credentials/CredentialsRestController.java
+++ b/src/main/java/io/gaia_app/credentials/CredentialsRestController.java
@@ -1,6 +1,6 @@
 package io.gaia_app.credentials;
 
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.User;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.annotation.Secured;
diff --git a/src/main/java/io/gaia_app/credentials/CredentialsService.kt b/src/main/java/io/gaia_app/credentials/CredentialsService.kt
index c80792738..a69f72315 100644
--- a/src/main/java/io/gaia_app/credentials/CredentialsService.kt
+++ b/src/main/java/io/gaia_app/credentials/CredentialsService.kt
@@ -1,7 +1,7 @@
 package io.gaia_app.credentials
 
 import io.gaia_app.encryption.EncryptionService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.stereotype.Service
 import java.util.*
diff --git a/src/main/java/io/gaia_app/dashboard/controller/DashboardRestController.kt b/src/main/java/io/gaia_app/dashboard/controller/DashboardRestController.kt
index f7057ad5f..6b06d4c2e 100644
--- a/src/main/java/io/gaia_app/dashboard/controller/DashboardRestController.kt
+++ b/src/main/java/io/gaia_app/dashboard/controller/DashboardRestController.kt
@@ -3,8 +3,8 @@ package io.gaia_app.dashboard.controller
 import io.gaia_app.modules.repository.TerraformModuleRepository
 import io.gaia_app.stacks.bo.StackState
 import io.gaia_app.stacks.repository.StackRepository
-import io.gaia_app.teams.Team
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.Organization
+import io.gaia_app.organizations.User
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -18,7 +18,7 @@ class DashboardRestController(
     private val stackRepository: StackRepository) {
 
     @GetMapping("/summary")
-    fun summary(user: User, team: Team?) =
+    fun summary(user: User, organization: Organization?) =
         when {
             user.isAdmin -> {
                 mapOf(
@@ -26,11 +26,11 @@ class DashboardRestController(
                     "runningStacksCount" to stackRepository.countStacksByState(StackState.RUNNING),
                     "toUpdateStacksCount" to stackRepository.countStacksByState(StackState.TO_UPDATE))
             }
-            team != null -> {
+            organization != null -> {
                 mapOf(
-                    "modulesCount" to moduleRepository.countByAuthorizedTeamsContainingOrModuleMetadataCreatedBy(team, user),
-                    "runningStacksCount" to stackRepository.countStacksByStateAndOwnerTeam(StackState.RUNNING, team),
-                    "toUpdateStacksCount" to stackRepository.countStacksByStateAndOwnerTeam(StackState.TO_UPDATE, team))
+                    "modulesCount" to moduleRepository.countByAuthorizedOrganizationsContainingOrModuleMetadataCreatedBy(organization, user),
+                    "runningStacksCount" to stackRepository.countStacksByStateAndOwnerOrganization(StackState.RUNNING, organization),
+                    "toUpdateStacksCount" to stackRepository.countStacksByStateAndOwnerOrganization(StackState.TO_UPDATE, organization))
             }
             else -> {
                 mapOf(
diff --git a/src/main/java/io/gaia_app/modules/bo/ModuleMetadata.kt b/src/main/java/io/gaia_app/modules/bo/ModuleMetadata.kt
index 6772f97f7..72a2bede1 100644
--- a/src/main/java/io/gaia_app/modules/bo/ModuleMetadata.kt
+++ b/src/main/java/io/gaia_app/modules/bo/ModuleMetadata.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.modules.bo
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.data.mongodb.core.mapping.DBRef
 import java.time.LocalDateTime
 
diff --git a/src/main/java/io/gaia_app/modules/bo/TerraformModule.java b/src/main/java/io/gaia_app/modules/bo/TerraformModule.java
index 3a5a44746..aa958b50d 100644
--- a/src/main/java/io/gaia_app/modules/bo/TerraformModule.java
+++ b/src/main/java/io/gaia_app/modules/bo/TerraformModule.java
@@ -1,8 +1,8 @@
 package io.gaia_app.modules.bo;
 
 import io.gaia_app.registries.RegistryDetails;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 import javax.validation.Valid;
@@ -37,7 +37,7 @@ public class TerraformModule {
     private TerraformImage terraformImage = TerraformImage.Companion.defaultInstance();
 
     @DBRef
-    private List<Team> authorizedTeams = new ArrayList<>();
+    private List<Organization> authorizedOrganizations = new ArrayList<>();
 
     private BigDecimal estimatedMonthlyCost;
 
@@ -121,16 +121,16 @@ public void setTerraformImage(TerraformImage terraformImage) {
         this.terraformImage = terraformImage;
     }
 
-    public List<Team> getAuthorizedTeams() {
-        return authorizedTeams;
+    public List<Organization> getAuthorizedOrganizations() {
+        return authorizedOrganizations;
     }
 
-    public void setAuthorizedTeams(List<Team> authorizedTeams) {
-        this.authorizedTeams = authorizedTeams;
+    public void setAuthorizedOrganizations(List<Organization> authorizedOrganizations) {
+        this.authorizedOrganizations = authorizedOrganizations;
     }
 
     public boolean isAuthorizedFor(User user) {
-        return user.isAdmin() || this.authorizedTeams.contains(user.getTeam()) || user.equals(this.moduleMetadata.getCreatedBy());
+        return user.isAdmin() || this.authorizedOrganizations.contains(user.getOrganization()) || user.equals(this.moduleMetadata.getCreatedBy());
     }
 
     public BigDecimal getEstimatedMonthlyCost() {
diff --git a/src/main/java/io/gaia_app/modules/controller/ModuleRestController.java b/src/main/java/io/gaia_app/modules/controller/ModuleRestController.java
index 180e667f7..f78efb61d 100644
--- a/src/main/java/io/gaia_app/modules/controller/ModuleRestController.java
+++ b/src/main/java/io/gaia_app/modules/controller/ModuleRestController.java
@@ -5,7 +5,7 @@
 import io.gaia_app.modules.repository.TerraformModuleGitRepository;
 import io.gaia_app.modules.repository.TerraformModuleRepository;
 import io.gaia_app.registries.service.RegistryService;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -47,8 +47,8 @@ public List<TerraformModule> findAllModules(User user) {
         if (user.isAdmin()) {
             return moduleRepository.findAll();
         }
-        if (user.getTeam() != null) {
-            return moduleRepository.findAllByModuleMetadataCreatedByOrAuthorizedTeamsContaining(user, user.getTeam());
+        if (user.getOrganization() != null) {
+            return moduleRepository.findAllByModuleMetadataCreatedByOrAuthorizedOrganizationsContaining(user, user.getOrganization());
         }
         return moduleRepository.findAllByModuleMetadataCreatedBy(user);
     }
diff --git a/src/main/java/io/gaia_app/modules/repository/TerraformModuleRepository.kt b/src/main/java/io/gaia_app/modules/repository/TerraformModuleRepository.kt
index 0da20c2f9..9f2b4fcba 100644
--- a/src/main/java/io/gaia_app/modules/repository/TerraformModuleRepository.kt
+++ b/src/main/java/io/gaia_app/modules/repository/TerraformModuleRepository.kt
@@ -1,15 +1,15 @@
 package io.gaia_app.modules.repository
 
 import io.gaia_app.modules.bo.TerraformModule
-import io.gaia_app.teams.Team
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.Organization
+import io.gaia_app.organizations.User
 import org.springframework.data.mongodb.repository.MongoRepository
 import org.springframework.stereotype.Repository
 
 @Repository
 interface TerraformModuleRepository : MongoRepository<TerraformModule, String> {
     fun countByModuleMetadataCreatedBy(user: User): Long
-    fun countByAuthorizedTeamsContainingOrModuleMetadataCreatedBy(team: Team, user: User): Long
-    fun findAllByModuleMetadataCreatedByOrAuthorizedTeamsContaining(user: User, team: Team): List<TerraformModule>
+    fun countByAuthorizedOrganizationsContainingOrModuleMetadataCreatedBy(organization: Organization, user: User): Long
+    fun findAllByModuleMetadataCreatedByOrAuthorizedOrganizationsContaining(user: User, organization: Organization): List<TerraformModule>
     fun findAllByModuleMetadataCreatedBy(user: User): List<TerraformModule>
 }
diff --git a/src/main/java/io/gaia_app/teams/AdminUserInitialization.java b/src/main/java/io/gaia_app/organizations/AdminUserInitialization.java
similarity index 97%
rename from src/main/java/io/gaia_app/teams/AdminUserInitialization.java
rename to src/main/java/io/gaia_app/organizations/AdminUserInitialization.java
index f971e217d..1b087465b 100644
--- a/src/main/java/io/gaia_app/teams/AdminUserInitialization.java
+++ b/src/main/java/io/gaia_app/organizations/AdminUserInitialization.java
@@ -1,4 +1,4 @@
-package io.gaia_app.teams;
+package io.gaia_app.organizations;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/io/gaia_app/teams/UserService.kt b/src/main/java/io/gaia_app/organizations/UserService.kt
similarity index 94%
rename from src/main/java/io/gaia_app/teams/UserService.kt
rename to src/main/java/io/gaia_app/organizations/UserService.kt
index 8c8df2659..880507d2b 100644
--- a/src/main/java/io/gaia_app/teams/UserService.kt
+++ b/src/main/java/io/gaia_app/organizations/UserService.kt
@@ -1,6 +1,6 @@
-package io.gaia_app.teams
+package io.gaia_app.organizations
 
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.repository.UserRepository
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Service
 
diff --git a/src/main/java/io/gaia_app/teams/bo.kt b/src/main/java/io/gaia_app/organizations/bo.kt
similarity index 80%
rename from src/main/java/io/gaia_app/teams/bo.kt
rename to src/main/java/io/gaia_app/organizations/bo.kt
index d54be8da9..d5c88563d 100644
--- a/src/main/java/io/gaia_app/teams/bo.kt
+++ b/src/main/java/io/gaia_app/organizations/bo.kt
@@ -1,4 +1,4 @@
-package io.gaia_app.teams
+package io.gaia_app.organizations
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -6,16 +6,16 @@ import org.springframework.data.annotation.Id
 import org.springframework.data.mongodb.core.mapping.DBRef
 
 /**
- * A Gaia Team, which groups users
+ * A Gaia Organization, which groups users
  */
-data class Team(val id: String)
+data class Organization(val id: String)
 
 /**
  * a Gaia user, which has granted access to modules
  */
 data class User(
         @Id val username: String,
-        @DBRef val team: Team?) {
+        @DBRef val organization: Organization?) {
 
     var isAdmin: Boolean = false
 
diff --git a/src/main/java/io/gaia_app/organizations/controller/OrganizationsRestController.java b/src/main/java/io/gaia_app/organizations/controller/OrganizationsRestController.java
new file mode 100644
index 000000000..b21942aff
--- /dev/null
+++ b/src/main/java/io/gaia_app/organizations/controller/OrganizationsRestController.java
@@ -0,0 +1,39 @@
+package io.gaia_app.organizations.controller;
+
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.repository.OrganizationsRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/organizations")
+public class OrganizationsRestController {
+
+    private OrganizationsRepository organizationsRepository;
+
+    @Autowired
+    public OrganizationsRestController(OrganizationsRepository organizationsRepository) {
+        this.organizationsRepository = organizationsRepository;
+    }
+
+    @GetMapping
+    public List<Organization> organizations(){
+        return this.organizationsRepository.findAll();
+    }
+
+    @PostMapping
+    @Secured("ROLE_ADMIN")
+    public Organization createOrganization(@RequestBody Organization organization){
+        return this.organizationsRepository.save(organization);
+    }
+
+    @DeleteMapping("/{organizationId}")
+    @Secured("ROLE_ADMIN")
+    public void deleteOrganization(@PathVariable String organizationId){
+        this.organizationsRepository.deleteById(organizationId);
+    }
+
+}
diff --git a/src/main/java/io/gaia_app/teams/controller/UserControllerAdvice.java b/src/main/java/io/gaia_app/organizations/controller/UserControllerAdvice.java
similarity index 77%
rename from src/main/java/io/gaia_app/teams/controller/UserControllerAdvice.java
rename to src/main/java/io/gaia_app/organizations/controller/UserControllerAdvice.java
index 62c9411ea..5d544cdc3 100644
--- a/src/main/java/io/gaia_app/teams/controller/UserControllerAdvice.java
+++ b/src/main/java/io/gaia_app/organizations/controller/UserControllerAdvice.java
@@ -1,8 +1,8 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
-import io.gaia_app.teams.repository.UserRepository;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
+import io.gaia_app.organizations.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -31,7 +31,7 @@ public User user(Authentication authentication) {
     }
 
     @ModelAttribute
-    public Team userTeam(Authentication authentication, @ModelAttribute User user) {
+    public Organization userOrganization(Authentication authentication, @ModelAttribute User user) {
         // in case of anonymous access (like healthcheck)
         if (authentication == null) {
             return null;
@@ -40,7 +40,7 @@ public Team userTeam(Authentication authentication, @ModelAttribute User user) {
         if ("gaia-runner".equals(authentication.getName())) {
             return null;
         }
-        return user.getTeam();
+        return user.getOrganization();
     }
 
 }
diff --git a/src/main/java/io/gaia_app/teams/controller/UsersRestController.java b/src/main/java/io/gaia_app/organizations/controller/UsersRestController.java
similarity index 89%
rename from src/main/java/io/gaia_app/teams/controller/UsersRestController.java
rename to src/main/java/io/gaia_app/organizations/controller/UsersRestController.java
index 6dcf82dd3..4a66763e6 100644
--- a/src/main/java/io/gaia_app/teams/controller/UsersRestController.java
+++ b/src/main/java/io/gaia_app/organizations/controller/UsersRestController.java
@@ -1,7 +1,7 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.User;
-import io.gaia_app.teams.UserService;
+import io.gaia_app.organizations.User;
+import io.gaia_app.organizations.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/io/gaia_app/organizations/repository/OrganizationsRepository.java b/src/main/java/io/gaia_app/organizations/repository/OrganizationsRepository.java
new file mode 100644
index 000000000..3aaa4bf8e
--- /dev/null
+++ b/src/main/java/io/gaia_app/organizations/repository/OrganizationsRepository.java
@@ -0,0 +1,9 @@
+package io.gaia_app.organizations.repository;
+
+import io.gaia_app.organizations.Organization;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrganizationsRepository extends MongoRepository<Organization, String> {
+}
diff --git a/src/main/java/io/gaia_app/teams/repository/UserRepository.kt b/src/main/java/io/gaia_app/organizations/repository/UserRepository.kt
similarity index 69%
rename from src/main/java/io/gaia_app/teams/repository/UserRepository.kt
rename to src/main/java/io/gaia_app/organizations/repository/UserRepository.kt
index e3a635e71..5a2e1b58e 100644
--- a/src/main/java/io/gaia_app/teams/repository/UserRepository.kt
+++ b/src/main/java/io/gaia_app/organizations/repository/UserRepository.kt
@@ -1,6 +1,6 @@
-package io.gaia_app.teams.repository
+package io.gaia_app.organizations.repository
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.data.mongodb.repository.MongoRepository
 import org.springframework.stereotype.Repository
 
diff --git a/src/main/java/io/gaia_app/registries/AbstractRegistryApi.kt b/src/main/java/io/gaia_app/registries/AbstractRegistryApi.kt
index d8d2b9e0f..01e7779c1 100644
--- a/src/main/java/io/gaia_app/registries/AbstractRegistryApi.kt
+++ b/src/main/java/io/gaia_app/registries/AbstractRegistryApi.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.registries
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
diff --git a/src/main/java/io/gaia_app/registries/RegistryApi.kt b/src/main/java/io/gaia_app/registries/RegistryApi.kt
index 93aa991d3..650b8c137 100644
--- a/src/main/java/io/gaia_app/registries/RegistryApi.kt
+++ b/src/main/java/io/gaia_app/registries/RegistryApi.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.registries
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 
 interface RegistryApi<T> {
 
diff --git a/src/main/java/io/gaia_app/registries/RegistryOAuth2Provider.java b/src/main/java/io/gaia_app/registries/RegistryOAuth2Provider.java
index 83f305114..be9e8dae3 100644
--- a/src/main/java/io/gaia_app/registries/RegistryOAuth2Provider.java
+++ b/src/main/java/io/gaia_app/registries/RegistryOAuth2Provider.java
@@ -1,6 +1,6 @@
 package io.gaia_app.registries;
 
-import io.gaia_app.teams.OAuth2User;
+import io.gaia_app.organizations.OAuth2User;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 
diff --git a/src/main/java/io/gaia_app/registries/controller/GithubRegistryController.kt b/src/main/java/io/gaia_app/registries/controller/GithubRegistryController.kt
index 43f05a6a7..91cfa76ca 100644
--- a/src/main/java/io/gaia_app/registries/controller/GithubRegistryController.kt
+++ b/src/main/java/io/gaia_app/registries/controller/GithubRegistryController.kt
@@ -5,7 +5,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.github.GithubRepository
 import io.gaia_app.registries.service.RegistryService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.http.HttpStatus
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
diff --git a/src/main/java/io/gaia_app/registries/controller/GitlabRegistryController.kt b/src/main/java/io/gaia_app/registries/controller/GitlabRegistryController.kt
index b62bf32df..fc59b564a 100644
--- a/src/main/java/io/gaia_app/registries/controller/GitlabRegistryController.kt
+++ b/src/main/java/io/gaia_app/registries/controller/GitlabRegistryController.kt
@@ -5,7 +5,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.gitlab.GitlabRepository
 import io.gaia_app.registries.service.RegistryService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.http.HttpStatus
 import org.springframework.security.access.annotation.Secured
 import org.springframework.web.bind.annotation.*
diff --git a/src/main/java/io/gaia_app/registries/service/RegistryService.kt b/src/main/java/io/gaia_app/registries/service/RegistryService.kt
index f8145cd02..66b6e9d96 100644
--- a/src/main/java/io/gaia_app/registries/service/RegistryService.kt
+++ b/src/main/java/io/gaia_app/registries/service/RegistryService.kt
@@ -7,7 +7,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryDetails
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.SourceRepository
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.springframework.stereotype.Service
 import java.util.*
 
diff --git a/src/main/java/io/gaia_app/stacks/bo/Job.java b/src/main/java/io/gaia_app/stacks/bo/Job.java
index 09568bd59..238244cf2 100644
--- a/src/main/java/io/gaia_app/stacks/bo/Job.java
+++ b/src/main/java/io/gaia_app/stacks/bo/Job.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.gaia_app.credentials.Credentials;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.User;
 import io.gaia_app.modules.bo.TerraformImage;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.DBRef;
diff --git a/src/main/java/io/gaia_app/stacks/bo/Stack.java b/src/main/java/io/gaia_app/stacks/bo/Stack.java
index 21b58cbf9..53c400931 100644
--- a/src/main/java/io/gaia_app/stacks/bo/Stack.java
+++ b/src/main/java/io/gaia_app/stacks/bo/Stack.java
@@ -1,8 +1,8 @@
 package io.gaia_app.stacks.bo;
 
 import io.gaia_app.modules.bo.TerraformModule;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 import javax.validation.constraints.NotBlank;
@@ -55,7 +55,7 @@ public class Stack {
     private StackState state = StackState.NEW;
 
     @DBRef
-    private Team ownerTeam;
+    private Organization ownerOrganization;
 
     private BigDecimal estimatedRunningCost;
 
@@ -127,12 +127,12 @@ public void setState(StackState state) {
         this.state = state;
     }
 
-    public void setOwnerTeam(Team ownerTeam) {
-        this.ownerTeam = ownerTeam;
+    public void setOwnerOrganization(Organization ownerOrganization) {
+        this.ownerOrganization = ownerOrganization;
     }
 
-    public Team getOwnerTeam() {
-        return ownerTeam;
+    public Organization getOwnerOrganization() {
+        return ownerOrganization;
     }
 
     public BigDecimal getEstimatedRunningCost() {
diff --git a/src/main/java/io/gaia_app/stacks/controller/StackRestController.java b/src/main/java/io/gaia_app/stacks/controller/StackRestController.java
index 696912de7..f4e5359e1 100644
--- a/src/main/java/io/gaia_app/stacks/controller/StackRestController.java
+++ b/src/main/java/io/gaia_app/stacks/controller/StackRestController.java
@@ -7,8 +7,8 @@
 import io.gaia_app.stacks.repository.JobRepository;
 import io.gaia_app.stacks.repository.StackRepository;
 import io.gaia_app.stacks.service.StackCostCalculator;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -47,8 +47,8 @@ public StackRestController(
     public List<Stack> listStacks(User user) {
         if (user.isAdmin()) {
             return stackRepository.findAll();
-        } else if (user.getTeam() != null) {
-            return stackRepository.findByOwnerTeam(user.getTeam());
+        } else if (user.getOrganization() != null) {
+            return stackRepository.findByOwnerOrganization(user.getOrganization());
         }
         return stackRepository.findByCreatedBy(user);
     }
@@ -58,8 +58,8 @@ public Stack getStack(@PathVariable String id, User user) {
         Stack stack;
         if (user.isAdmin()) {
             stack = stackRepository.findById(id).orElseThrow(StackNotFoundException::new);
-        } else if (user.getTeam() != null) {
-            stack = stackRepository.findByIdAndOwnerTeam(id, user.getTeam()).orElseThrow(StackNotFoundException::new);
+        } else if (user.getOrganization() != null) {
+            stack = stackRepository.findByIdAndOwnerOrganization(id, user.getOrganization()).orElseThrow(StackNotFoundException::new);
         } else {
             stack = stackRepository.findById(id).orElseThrow(StackNotFoundException::new);
         }
@@ -68,8 +68,8 @@ public Stack getStack(@PathVariable String id, User user) {
     }
 
     @PostMapping
-    public Stack save(@RequestBody @Valid Stack stack, Team userTeam, User user) {
-        stack.setOwnerTeam(userTeam);
+    public Stack save(@RequestBody @Valid Stack stack, Organization userOrganization, User user) {
+        stack.setOwnerOrganization(userOrganization);
         stack.setId(UUID.randomUUID().toString());
         stack.setCreatedBy(user);
         stack.setCreatedAt(LocalDateTime.now());
diff --git a/src/main/java/io/gaia_app/stacks/repository/StackRepository.kt b/src/main/java/io/gaia_app/stacks/repository/StackRepository.kt
index 2c51a08e8..696893aef 100644
--- a/src/main/java/io/gaia_app/stacks/repository/StackRepository.kt
+++ b/src/main/java/io/gaia_app/stacks/repository/StackRepository.kt
@@ -2,8 +2,8 @@ package io.gaia_app.stacks.repository
 
 import io.gaia_app.stacks.bo.Stack
 import io.gaia_app.stacks.bo.StackState
-import io.gaia_app.teams.Team
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.Organization
+import io.gaia_app.organizations.User
 import org.springframework.data.mongodb.repository.MongoRepository
 import org.springframework.stereotype.Repository
 import java.util.*
@@ -13,10 +13,10 @@ import java.util.*
  */
 @Repository
 interface StackRepository : MongoRepository<Stack, String> {
-    fun countStacksByStateAndOwnerTeam(state: StackState, team: Team): Long
+    fun countStacksByStateAndOwnerOrganization(state: StackState, organization: Organization): Long
     fun countStacksByStateAndCreatedBy(state: StackState, user: User): Long
     fun countStacksByState(state: StackState): Long
-    fun findByCreatedBy(userWithNoTeam: User): List<Stack>
-    fun findByOwnerTeam(team: Team): List<Stack>
-    fun findByIdAndOwnerTeam(id: String, team: Team): Optional<Stack>
+    fun findByCreatedBy(userWithNoOrganization: User): List<Stack>
+    fun findByOwnerOrganization(organization: Organization): List<Stack>
+    fun findByIdAndOwnerOrganization(id: String, organization: Organization): Optional<Stack>
 }
diff --git a/src/main/java/io/gaia_app/teams/controller/TeamsRestController.java b/src/main/java/io/gaia_app/teams/controller/TeamsRestController.java
deleted file mode 100644
index 48818c585..000000000
--- a/src/main/java/io/gaia_app/teams/controller/TeamsRestController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.gaia_app.teams.controller;
-
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.repository.TeamRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.annotation.Secured;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/teams")
-public class TeamsRestController {
-
-    private TeamRepository teamRepository;
-
-    @Autowired
-    public TeamsRestController(TeamRepository teamRepository) {
-        this.teamRepository = teamRepository;
-    }
-
-    @GetMapping
-    public List<Team> teams(){
-        return this.teamRepository.findAll();
-    }
-
-    @PostMapping
-    @Secured("ROLE_ADMIN")
-    public Team createOrganization(@RequestBody Team organization){
-        return this.teamRepository.save(organization);
-    }
-
-    @DeleteMapping("/{organizationId}")
-    @Secured("ROLE_ADMIN")
-    public void deleteOrganization(@PathVariable String organizationId){
-        this.teamRepository.deleteById(organizationId);
-    }
-
-}
diff --git a/src/main/java/io/gaia_app/teams/repository/TeamRepository.java b/src/main/java/io/gaia_app/teams/repository/TeamRepository.java
deleted file mode 100644
index b22dfa44d..000000000
--- a/src/main/java/io/gaia_app/teams/repository/TeamRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.gaia_app.teams.repository;
-
-import io.gaia_app.teams.Team;
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TeamRepository extends MongoRepository<Team, String> {
-}
diff --git a/src/main/java/io/gaia_app/vault/VaultCredentialsService.kt b/src/main/java/io/gaia_app/vault/VaultCredentialsService.kt
index b4cf4d9df..d81ad5fe4 100644
--- a/src/main/java/io/gaia_app/vault/VaultCredentialsService.kt
+++ b/src/main/java/io/gaia_app/vault/VaultCredentialsService.kt
@@ -3,7 +3,7 @@ package io.gaia_app.vault
 import com.fasterxml.jackson.annotation.JsonAlias
 import io.gaia_app.credentials.*
 import io.gaia_app.encryption.EncryptionService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
diff --git a/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerIT.kt b/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerIT.kt
index 5b291e749..8a746377e 100644
--- a/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerIT.kt
+++ b/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerIT.kt
@@ -26,7 +26,7 @@ class AuthenticationRestControllerIT: SharedMongoContainerTest() {
     @BeforeAll
     fun setUp() {
         mongo.emptyDatabase()
-        mongo.runScript("00_team.js")
+        mongo.runScript("00_organization.js")
         mongo.runScript("10_user.js")
     }
 
@@ -37,7 +37,7 @@ class AuthenticationRestControllerIT: SharedMongoContainerTest() {
             .andExpect(status().isOk)
             .andExpect(jsonPath("$.username", equalTo("admin")))
             .andExpect(jsonPath("$.admin", equalTo(true)))
-            .andExpect(jsonPath("$.team.id", equalTo("Ze Team")))
+            .andExpect(jsonPath("$.organization.id", equalTo("Ze Organization")))
     }
 
     @Test
diff --git a/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerTest.kt b/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerTest.kt
index 60e1d8214..6e852e1e1 100644
--- a/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerTest.kt
+++ b/src/test/java/io/gaia_app/client/controller/AuthenticationRestControllerTest.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.client.controller
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import io.gaia_app.test.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
diff --git a/src/test/java/io/gaia_app/config/security/AuthenticationHandlerTest.kt b/src/test/java/io/gaia_app/config/security/AuthenticationHandlerTest.kt
index 0f51379b6..b7a7a0e2c 100644
--- a/src/test/java/io/gaia_app/config/security/AuthenticationHandlerTest.kt
+++ b/src/test/java/io/gaia_app/config/security/AuthenticationHandlerTest.kt
@@ -1,8 +1,8 @@
 package io.gaia_app.config.security
 
 import com.jayway.jsonpath.JsonPath
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import io.gaia_app.test.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -65,7 +65,7 @@ class AuthenticationHandlerTest {
             assertThat(captor.value)
                 .isNotNull
                 .hasFieldOrPropertyWithValue("username", "spencer")
-                .hasFieldOrPropertyWithValue("team", null)
+                .hasFieldOrPropertyWithValue("organization", null)
         }
 
         @Test
diff --git a/src/test/java/io/gaia_app/config/security/SecurityConfigIT.kt b/src/test/java/io/gaia_app/config/security/SecurityConfigIT.kt
index b35870936..17f0b2d7a 100644
--- a/src/test/java/io/gaia_app/config/security/SecurityConfigIT.kt
+++ b/src/test/java/io/gaia_app/config/security/SecurityConfigIT.kt
@@ -1,7 +1,7 @@
 package io.gaia_app.config.security
 
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import io.gaia_app.test.any
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -16,7 +16,6 @@ import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequ
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf
 import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated
 import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated
-import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.TestPropertySource
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
diff --git a/src/test/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandlerTest.kt b/src/test/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandlerTest.kt
index 4d385a1bb..3823c831a 100644
--- a/src/test/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandlerTest.kt
+++ b/src/test/java/io/gaia_app/config/security/oauth2/OAuth2SuccessHandlerTest.kt
@@ -1,9 +1,9 @@
 package io.gaia_app.config.security.oauth2
 
 import io.gaia_app.registries.RegistryOAuth2Provider
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
-import io.gaia_app.teams.repository.UserRepository
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
+import io.gaia_app.organizations.repository.UserRepository
 import io.gaia_app.test.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
@@ -69,7 +69,7 @@ class OAuth2SuccessHandlerTest {
         assertThat(captor.value)
             .isNotNull
             .hasFieldOrPropertyWithValue("username", "django")
-            .hasFieldOrPropertyWithValue("team", null)
+            .hasFieldOrPropertyWithValue("organization", null)
     }
 
     @Test
diff --git a/src/test/java/io/gaia_app/credentials/CredentialsRestControllerIT.java b/src/test/java/io/gaia_app/credentials/CredentialsRestControllerIT.java
index 881bd2efc..351af22b0 100644
--- a/src/test/java/io/gaia_app/credentials/CredentialsRestControllerIT.java
+++ b/src/test/java/io/gaia_app/credentials/CredentialsRestControllerIT.java
@@ -29,7 +29,7 @@ class CredentialsRestControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setup() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("70_credentials.js");
     }
diff --git a/src/test/java/io/gaia_app/credentials/CredentialsRestControllerVaultIT.java b/src/test/java/io/gaia_app/credentials/CredentialsRestControllerVaultIT.java
index 15ff6386a..34289cf87 100644
--- a/src/test/java/io/gaia_app/credentials/CredentialsRestControllerVaultIT.java
+++ b/src/test/java/io/gaia_app/credentials/CredentialsRestControllerVaultIT.java
@@ -29,7 +29,7 @@ class CredentialsRestControllerVaultIT extends SharedMongoContainerTest {
     @BeforeEach
     void setup() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("70_credentials.js");
     }
diff --git a/src/test/java/io/gaia_app/credentials/PlainCredentialsServiceTest.kt b/src/test/java/io/gaia_app/credentials/PlainCredentialsServiceTest.kt
index 467366811..dfcbf012b 100644
--- a/src/test/java/io/gaia_app/credentials/PlainCredentialsServiceTest.kt
+++ b/src/test/java/io/gaia_app/credentials/PlainCredentialsServiceTest.kt
@@ -1,6 +1,6 @@
 package io.gaia_app.credentials
 
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.InjectMocks
diff --git a/src/test/java/io/gaia_app/dashboard/controller/DashboardRestControllerTest.kt b/src/test/java/io/gaia_app/dashboard/controller/DashboardRestControllerTest.kt
index 411388b2b..b96e380c9 100644
--- a/src/test/java/io/gaia_app/dashboard/controller/DashboardRestControllerTest.kt
+++ b/src/test/java/io/gaia_app/dashboard/controller/DashboardRestControllerTest.kt
@@ -3,8 +3,8 @@ package io.gaia_app.dashboard.controller
 import io.gaia_app.modules.repository.TerraformModuleRepository
 import io.gaia_app.stacks.bo.StackState
 import io.gaia_app.stacks.repository.StackRepository
-import io.gaia_app.teams.Team
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.Organization
+import io.gaia_app.organizations.User
 import io.gaia_app.test.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
@@ -73,19 +73,19 @@ class DashboardRestControllerTest {
     }
 
     @Nested
-    inner class WhenUserWithTeamTest {
+    inner class WhenUserWithOrganizationTest {
 
-        private val team = Team("userTeam")
-        private val user = User("user", team)
+        private val organization = Organization("userOrganization")
+        private val user = User("user", organization)
 
         @Test
         fun `summary() should return modules count`() {
             // when
-            whenever(moduleRepository.countByAuthorizedTeamsContainingOrModuleMetadataCreatedBy(team, user)).thenReturn(4)
-            val result = controller.summary(user, team)
+            whenever(moduleRepository.countByAuthorizedOrganizationsContainingOrModuleMetadataCreatedBy(organization, user)).thenReturn(4)
+            val result = controller.summary(user, organization)
 
             // then
-            verify(moduleRepository, times(1)).countByAuthorizedTeamsContainingOrModuleMetadataCreatedBy(team, user)
+            verify(moduleRepository, times(1)).countByAuthorizedOrganizationsContainingOrModuleMetadataCreatedBy(organization, user)
             verifyNoMoreInteractions(moduleRepository)
             assertThat(result)
                 .isNotNull
@@ -95,13 +95,13 @@ class DashboardRestControllerTest {
         @Test
         fun `summary() should return stacks count`() {
             // when
-            whenever(stackRepository.countStacksByStateAndOwnerTeam(StackState.RUNNING, team)).thenReturn(5)
-            whenever(stackRepository.countStacksByStateAndOwnerTeam(StackState.TO_UPDATE, team)).thenReturn(6)
-            val result = controller.summary(user, team)
+            whenever(stackRepository.countStacksByStateAndOwnerOrganization(StackState.RUNNING, organization)).thenReturn(5)
+            whenever(stackRepository.countStacksByStateAndOwnerOrganization(StackState.TO_UPDATE, organization)).thenReturn(6)
+            val result = controller.summary(user, organization)
 
             // then
-            verify(stackRepository, times(1)).countStacksByStateAndOwnerTeam(StackState.RUNNING, team)
-            verify(stackRepository, times(1)).countStacksByStateAndOwnerTeam(StackState.TO_UPDATE, team)
+            verify(stackRepository, times(1)).countStacksByStateAndOwnerOrganization(StackState.RUNNING, organization)
+            verify(stackRepository, times(1)).countStacksByStateAndOwnerOrganization(StackState.TO_UPDATE, organization)
             verifyNoMoreInteractions(stackRepository)
             assertThat(result)
                 .isNotNull
@@ -112,7 +112,7 @@ class DashboardRestControllerTest {
     }
 
     @Nested
-    inner class WhenUserWithoutTeamTest {
+    inner class WhenUserWithoutOrganizationTest {
 
         private val user = User("user", null)
 
diff --git a/src/test/java/io/gaia_app/e2e/CucumberContextConfiguration.java b/src/test/java/io/gaia_app/e2e/CucumberContextConfiguration.java
index 9ef24c78b..ff02bba74 100644
--- a/src/test/java/io/gaia_app/e2e/CucumberContextConfiguration.java
+++ b/src/test/java/io/gaia_app/e2e/CucumberContextConfiguration.java
@@ -26,7 +26,7 @@ public class CucumberContextConfiguration extends SharedMongoContainerTest {
     @Before
     public void setup_cucumber_spring_context() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("20_module.js");
         mongo.runScript("30_stack.js");
diff --git a/src/test/java/io/gaia_app/modules/bo/TerraformModuleTest.java b/src/test/java/io/gaia_app/modules/bo/TerraformModuleTest.java
index b8a2b8b0e..0fcbda411 100644
--- a/src/test/java/io/gaia_app/modules/bo/TerraformModuleTest.java
+++ b/src/test/java/io/gaia_app/modules/bo/TerraformModuleTest.java
@@ -1,7 +1,7 @@
 package io.gaia_app.modules.bo;
 
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -28,7 +28,7 @@ void module_shouldBeAuthorized_forAdminUser(){
     @Test
     void module_shouldBeAuthorized_forTheModuleCreator(){
         // given
-        var sg1 = new Team("SG-1");
+        var sg1 = new Organization("SG-1");
         var daniel = new User("Daniel Jackson", sg1);
 
         var module = new TerraformModule();
@@ -43,13 +43,13 @@ void module_shouldBeAuthorized_forTheModuleCreator(){
 
 
     @Test
-    void module_shouldBeAuthorized_forAUserOfAnAuthorizedTeam(){
+    void module_shouldBeAuthorized_forAUserOfAnAuthorizedOrganization(){
         // given
-        var sg1 = new Team("SG-1");
+        var sg1 = new Organization("SG-1");
         var daniel = new User("Daniel Jackson", sg1);
 
         var module = new TerraformModule();
-        module.setAuthorizedTeams(List.of(sg1));
+        module.setAuthorizedOrganizations(List.of(sg1));
 
         // when
         var authorized = module.isAuthorizedFor(daniel);
@@ -59,9 +59,9 @@ void module_shouldBeAuthorized_forAUserOfAnAuthorizedTeam(){
     }
 
     @Test
-    void module_shouldBeUnauthorized_forAUserOfAnUnauthorizedTeam(){
+    void module_shouldBeUnauthorized_forAUserOfAnUnauthorizedOrganization(){
         // given
-        var sg1 = new Team("SG-1");
+        var sg1 = new Organization("SG-1");
         var daniel = new User("Daniel Jackson", sg1);
 
         var module = new TerraformModule();
diff --git a/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerIT.java b/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerIT.java
index 7e7061eeb..9afeed637 100644
--- a/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerIT.java
+++ b/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerIT.java
@@ -18,7 +18,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Simple integration test that validates the security configuration of the TeamsRestController, and its http routes
+ * Simple integration test that validates the security configuration of the OrganizationsRestController, and its http routes
  */
 @SpringBootTest
 @AutoConfigureMockMvc
@@ -31,7 +31,7 @@ class ModuleRestControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setup() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("20_module.js");
     }
@@ -43,7 +43,7 @@ void findAllModules_shouldReturnLimitedModules_forStandardUsers() throws Excepti
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$", hasSize(1)))
                 .andExpect(jsonPath("$[0]name", is("terraform-docker-mongo-limited")))
-                .andExpect(jsonPath("$[0]authorizedTeams..id", contains("Not Ze Team")));
+                .andExpect(jsonPath("$[0]authorizedOrganizations..id", contains("Not Ze Organization")));
     }
 
     @Test
@@ -52,7 +52,7 @@ void findAllModules_shouldReturnAllModules_forAdmin() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$", hasSize(3)))
                 .andExpect(jsonPath("$[*]name", contains("terraform-docker-mongo", "terraform-docker-mongo-limited", "terraform-docker-mongo-with-validation")))
-                .andExpect(jsonPath("$..authorizedTeams..id", contains("Ze Team", "Not Ze Team", "Ze Team")));
+                .andExpect(jsonPath("$..authorizedOrganizations..id", contains("Ze Organization", "Not Ze Organization", "Ze Organization")));
     }
 
     @Test
@@ -65,7 +65,7 @@ void findModule_shouldReturnModule_forStandardUsers() throws Exception {
 
     @Test
     @WithMockUser("Mary J")
-    void findModule_shouldNotReturnModuleOfOtherTeams_forStandardUsers() throws Exception {
+    void findModule_shouldNotReturnModuleOfOtherOrganizations_forStandardUsers() throws Exception {
         mockMvc.perform(get("/api/modules/e01f9925-a559-45a2-8a55-f93dc434c676"))
                 .andExpect(status().isForbidden());
     }
@@ -78,7 +78,7 @@ void findModule_shouldReturnModules_forAdmin() throws Exception {
     }
 
     @Test
-    void findModule_shouldReturnModulesOfOtherTeams_forAdmin() throws Exception {
+    void findModule_shouldReturnModulesOfOtherOrganizations_forAdmin() throws Exception {
         mockMvc.perform(get("/api/modules/845543d0-20a5-466c-8978-33c9a4661606"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.name", is("terraform-docker-mongo-limited")));
diff --git a/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerTest.java b/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerTest.java
index 8f5733379..dc49a75c3 100644
--- a/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerTest.java
+++ b/src/test/java/io/gaia_app/modules/controller/ModuleRestControllerTest.java
@@ -6,8 +6,8 @@
 import io.gaia_app.registries.RegistryDetails;
 import io.gaia_app.registries.RegistryType;
 import io.gaia_app.registries.service.RegistryService;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import io.gaia_app.modules.bo.TerraformModule;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -50,7 +50,7 @@ class ModuleRestControllerTest {
 
     private User john;
 
-    private Team bobsTeam;
+    private Organization bobsOrganization;
 
     @BeforeEach
     void setUp() {
@@ -59,8 +59,8 @@ void setUp() {
 
         john = new User("John Dorian", null);
 
-        bobsTeam = new Team("bobsTeam");
-        bob = new User("Bob Kelso", bobsTeam);
+        bobsOrganization = new Organization("bobsOrganization");
+        bob = new User("Bob Kelso", bobsOrganization);
     }
 
     @Test
@@ -73,20 +73,20 @@ void findAll_shouldReturnAllModules_forAdmin(){
     }
 
     @Test
-    void findAll_shouldReturnAuthorizedModules_forUserTeam_andOwnedModules(){
+    void findAll_shouldReturnAuthorizedModules_forUserOrganization_andOwnedModules(){
         // given
-        when(moduleRepository.findAllByModuleMetadataCreatedByOrAuthorizedTeamsContaining(bob, bobsTeam)).thenReturn(List.of(new TerraformModule()));
+        when(moduleRepository.findAllByModuleMetadataCreatedByOrAuthorizedOrganizationsContaining(bob, bobsOrganization)).thenReturn(List.of(new TerraformModule()));
 
         // when
         var modules = moduleRestController.findAllModules(bob);
 
         // then
         Assertions.assertThat(modules).hasSize(1);
-        verify(moduleRepository).findAllByModuleMetadataCreatedByOrAuthorizedTeamsContaining(bob, bobsTeam);
+        verify(moduleRepository).findAllByModuleMetadataCreatedByOrAuthorizedOrganizationsContaining(bob, bobsOrganization);
     }
 
     @Test
-    void findAll_shouldReturnOwnedModules_forUserWithNoTeam(){
+    void findAll_shouldReturnOwnedModules_forUserWithNoOrganization(){
         // when
         var modules = moduleRestController.findAllModules(john);
 
@@ -107,7 +107,7 @@ void findById_shouldReturnModule_forAdmin(){
     }
 
     @Test
-    void findById_shouldReturnOwnedModule_forUserWithNoTeam(){
+    void findById_shouldReturnOwnedModule_forUserWithNoOrganization(){
         // given
         var ownedModule = new TerraformModule();
         ownedModule.getModuleMetadata().setCreatedBy(john);
@@ -121,7 +121,7 @@ void findById_shouldReturnOwnedModule_forUserWithNoTeam(){
     }
 
     @Test
-    void findById_shouldReturnAuthorizedModule_forUserTeam(){
+    void findById_shouldReturnAuthorizedModule_forUserOrganization(){
         // given
         var module = mock(TerraformModule.class);
         when(module.isAuthorizedFor(bob)).thenReturn(true);
diff --git a/src/test/java/io/gaia_app/modules/repository/TerraformModuleRepositoryIT.java b/src/test/java/io/gaia_app/modules/repository/TerraformModuleRepositoryIT.java
index f9c86aad0..96ba741ac 100644
--- a/src/test/java/io/gaia_app/modules/repository/TerraformModuleRepositoryIT.java
+++ b/src/test/java/io/gaia_app/modules/repository/TerraformModuleRepositoryIT.java
@@ -1,8 +1,8 @@
 package io.gaia_app.modules.repository;
 
 import io.gaia_app.modules.bo.TerraformModule;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import io.gaia_app.test.SharedMongoContainerTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -23,9 +23,9 @@ class TerraformModuleRepositoryIT extends SharedMongoContainerTest {
 
     @BeforeEach
     void setUp() {
-        // sample teams
-        Team team1 = new Team("team1");
-        Team team2 = new Team("team2");
+        // sample organizations
+        Organization organization1 = new Organization("organization1");
+        Organization organization2 = new Organization("organization2");
 
         // sample owners
         bob = new User("Bob", null);
@@ -33,12 +33,12 @@ void setUp() {
         // saving sample modules
         TerraformModule module1 = new TerraformModule();
         module1.setId("Module 1");
-        module1.setAuthorizedTeams(List.of(team1));
+        module1.setAuthorizedOrganizations(List.of(organization1));
         module1.getModuleMetadata().setCreatedBy(bob);
 
         TerraformModule module2 = new TerraformModule();
         module2.setId("Module 2");
-        module2.setAuthorizedTeams(List.of(team1, team2));
+        module2.setAuthorizedOrganizations(List.of(organization1, organization2));
         module2.getModuleMetadata().setCreatedBy(bob);
 
         terraformModuleRepository.deleteAll();
diff --git a/src/test/java/io/gaia_app/teams/AdminUserInitializationTest.kt b/src/test/java/io/gaia_app/organizations/AdminUserInitializationTest.kt
similarity index 86%
rename from src/test/java/io/gaia_app/teams/AdminUserInitializationTest.kt
rename to src/test/java/io/gaia_app/organizations/AdminUserInitializationTest.kt
index 71e65ad77..caf355420 100644
--- a/src/test/java/io/gaia_app/teams/AdminUserInitializationTest.kt
+++ b/src/test/java/io/gaia_app/organizations/AdminUserInitializationTest.kt
@@ -1,23 +1,17 @@
-package io.gaia_app.teams
+package io.gaia_app.organizations
 
-import io.gaia_app.teams.repository.UserRepository
 import io.gaia_app.test.capture
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
-import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.extension.ExtendWith
-import org.junit.runner.RunWith
 import org.mockito.ArgumentCaptor
 import org.mockito.Captor
 import org.mockito.InjectMocks
 import org.mockito.Mock
 import org.mockito.Mockito.*
-import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.junit.jupiter.MockitoExtension
 import org.springframework.boot.context.event.ApplicationReadyEvent
-import org.springframework.context.ApplicationEvent
-import java.util.*
 
 @ExtendWith(MockitoExtension::class)
 internal class AdminUserInitializationTest {
diff --git a/src/test/java/io/gaia_app/teams/controller/TeamsRestControllerIT.java b/src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerIT.java
similarity index 60%
rename from src/test/java/io/gaia_app/teams/controller/TeamsRestControllerIT.java
rename to src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerIT.java
index a510fb115..55b093087 100644
--- a/src/test/java/io/gaia_app/teams/controller/TeamsRestControllerIT.java
+++ b/src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerIT.java
@@ -1,7 +1,7 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.repository.TeamRepository;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.repository.OrganizationsRepository;
 import io.gaia_app.test.SharedMongoContainerTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -24,18 +24,18 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Simple integration test that validates the security configuration of the TeamsRestController, and its http routes
+ * Simple integration test that validates the security configuration of the OrganizationsRestController, and its http routes
  */
 @SpringBootTest
 @AutoConfigureMockMvc
 @WithMockUser(value = "admin", roles = "ADMIN")
-class TeamsRestControllerIT extends SharedMongoContainerTest {
+class OrganizationsRestControllerIT extends SharedMongoContainerTest {
 
     @Autowired
-    private TeamsRestController teamsRestController;
+    private OrganizationsRestController organizationsRestController;
 
     @Autowired
-    private TeamRepository teamRepository;
+    private OrganizationsRepository organizationsRepository;
 
     @Autowired
     private MockMvc mockMvc;
@@ -43,38 +43,38 @@ class TeamsRestControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setUp() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
     }
 
     @Test
-    void teams_shouldBeExposed_atSpecificUrl() throws Exception {
-        mockMvc.perform(get("/api/teams"))
+    void organizations_shouldBeExposed_atSpecificUrl() throws Exception {
+        mockMvc.perform(get("/api/organizations"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$", hasSize(3)))
-            .andExpect(jsonPath("$..id", contains("Ze Team", "Not Ze Team", "Sith")));
+            .andExpect(jsonPath("$..id", contains("Ze Organization", "Not Ze Organization", "Sith")));
     }
 
     @Test
     void createOrganization_shouldCreateOrganization() throws Exception {
-        mockMvc.perform(post("/api/teams")
+        mockMvc.perform(post("/api/organizations")
             .with(csrf())
             .contentType(MediaType.APPLICATION_JSON)
             .content("{\"id\":\"Gungans\"}"))
             .andExpect(status().isOk());
 
-        assertTrue(teamRepository.existsById("Gungans"));
+        assertTrue(organizationsRepository.existsById("Gungans"));
     }
 
     @Test
     void deleteOrganization_shouldDeleteOrganization() throws Exception {
-        teamRepository.save(new Team("First Order"));
+        organizationsRepository.save(new Organization("First Order"));
 
-        mockMvc.perform(delete("/api/teams/First Order")
+        mockMvc.perform(delete("/api/organizations/First Order")
             .with(csrf()))
             .andExpect(status().isOk());
 
-        assertFalse(teamRepository.existsById("First Order"));
+        assertFalse(organizationsRepository.existsById("First Order"));
     }
 
     @Nested
@@ -82,26 +82,26 @@ class AccessControl {
 
         @Test
         @WithMockUser("Jar Jar Binks")
-        void teams_shouldBeAccessible_forStandardUsers() {
-            Assertions.assertDoesNotThrow(() -> teamsRestController.teams());
+        void organizations_shouldBeAccessible_forStandardUsers() {
+            Assertions.assertDoesNotThrow(() -> organizationsRestController.organizations());
         }
 
         @Test
         @WithMockUser("Jar Jar Binks")
         void createOrganization_shouldBeForbidden_forStandardUsers() {
-            assertThrows(AccessDeniedException.class, () -> teamsRestController.createOrganization(new Team("Gungans")));
+            assertThrows(AccessDeniedException.class, () -> organizationsRestController.createOrganization(new Organization("Gungans")));
         }
 
         @Test
         @WithMockUser("Jar Jar Binks")
         void deleteOrganization_shouldBeForbidden_forStandardUsers() {
-            assertThrows(AccessDeniedException.class, () -> teamsRestController.deleteOrganization("Gungans"));
+            assertThrows(AccessDeniedException.class, () -> organizationsRestController.deleteOrganization("Gungans"));
         }
 
         @Test
         @WithMockUser(value = "admin", roles = "ADMIN")
-        void teams_shouldBeAccessible_forAdminUser() {
-            Assertions.assertDoesNotThrow(() -> teamsRestController.teams());
+        void organizations_shouldBeAccessible_forAdminUser() {
+            Assertions.assertDoesNotThrow(() -> organizationsRestController.organizations());
         }
 
     }
diff --git a/src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerTest.java b/src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerTest.java
new file mode 100644
index 000000000..0aa2fb30a
--- /dev/null
+++ b/src/test/java/io/gaia_app/organizations/controller/OrganizationsRestControllerTest.java
@@ -0,0 +1,39 @@
+package io.gaia_app.organizations.controller;
+
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.repository.OrganizationsRepository;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class OrganizationsRestControllerTest {
+
+    @Mock
+    private OrganizationsRepository organizationsRepository;
+
+    @InjectMocks
+    private OrganizationsRestController organizationsRestController;
+
+    @Test
+    void organizations_shouldReturnAllOrganizations() {
+        // given
+        var a = new Organization("A");
+        when(organizationsRepository.findAll()).thenReturn(List.of(a));
+
+        // when
+        var organizations = organizationsRestController.organizations();
+
+        // then
+        assertThat(organizations).contains(a);
+        verify(organizationsRepository).findAll();
+    }
+}
diff --git a/src/test/java/io/gaia_app/teams/controller/UserControllerAdviceTest.java b/src/test/java/io/gaia_app/organizations/controller/UserControllerAdviceTest.java
similarity index 73%
rename from src/test/java/io/gaia_app/teams/controller/UserControllerAdviceTest.java
rename to src/test/java/io/gaia_app/organizations/controller/UserControllerAdviceTest.java
index b09078458..d45341443 100644
--- a/src/test/java/io/gaia_app/teams/controller/UserControllerAdviceTest.java
+++ b/src/test/java/io/gaia_app/organizations/controller/UserControllerAdviceTest.java
@@ -1,8 +1,8 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
-import io.gaia_app.teams.repository.UserRepository;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
+import io.gaia_app.organizations.repository.UserRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -50,20 +50,20 @@ void user_shouldReturnNothing_withoutAuthentication() {
     }
 
     @Test
-    void userTeam_shouldTeamOfUser() {
+    void userOrganization_shouldOrganizationOfUser() {
         // given
-        var the_wailers = new Team("the_wailers");
+        var the_wailers = new Organization("the_wailers");
         var marley = new User("marley", the_wailers);
 
         // when
-        var result = userControllerAdvice.userTeam(authentication, marley);
+        var result = userControllerAdvice.userOrganization(authentication, marley);
 
         // then
         assertThat(result).isEqualTo(the_wailers);
     }
 
     @Test
-    void userTeam_shouldReturnNothing_withoutAuthentication() {
-        assertNull(userControllerAdvice.userTeam(null, null));
+    void userOrganization_shouldReturnNothing_withoutAuthentication() {
+        assertNull(userControllerAdvice.userOrganization(null, null));
     }
 }
diff --git a/src/test/java/io/gaia_app/teams/controller/UsersRestControllerIT.java b/src/test/java/io/gaia_app/organizations/controller/UsersRestControllerIT.java
similarity index 88%
rename from src/test/java/io/gaia_app/teams/controller/UsersRestControllerIT.java
rename to src/test/java/io/gaia_app/organizations/controller/UsersRestControllerIT.java
index a642f8e8f..92a55ab0b 100644
--- a/src/test/java/io/gaia_app/teams/controller/UsersRestControllerIT.java
+++ b/src/test/java/io/gaia_app/organizations/controller/UsersRestControllerIT.java
@@ -1,8 +1,8 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
-import io.gaia_app.teams.repository.UserRepository;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
+import io.gaia_app.organizations.repository.UserRepository;
 import io.gaia_app.test.SharedMongoContainerTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +49,7 @@ class UsersRestControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setUp() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
     }
 
@@ -60,7 +60,7 @@ void users_shouldBeExposed_atSpecificUrl() throws Exception {
             .andExpect(jsonPath("$", hasSize(5)))
             .andExpect(jsonPath("$..username", contains("admin", "Mary J", "Darth Vader", "Luke Skywalker", "selmak")))
             .andExpect(jsonPath("$..admin", contains(true, false, false, false, false)))
-            .andExpect(jsonPath("$..team.id", contains("Ze Team", "Not Ze Team")));
+            .andExpect(jsonPath("$..organization.id", contains("Ze Organization", "Not Ze Organization")));
     }
 
     @Test
@@ -72,35 +72,35 @@ void saveUser_shouldBeExposed_atSpecificUrl() throws Exception {
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.username", is("Luke Skywalker")))
             .andExpect(jsonPath("$.admin", is(false)))
-            .andExpect(jsonPath("$.team", is(emptyOrNullString())));
+            .andExpect(jsonPath("$.organization", is(emptyOrNullString())));
 
         assertThat(userRepository.existsById("Luke Skywalker")).isTrue();
     }
 
     @Test
-    void users_canBeChangedOfTeam() throws Exception {
+    void users_canBeChangedOfOrganization() throws Exception {
         // given
         assertThat(userRepository.findById("Darth Vader"))
             .isPresent()
-            .map(User::getTeam)
+            .map(User::getOrganization)
             .isNotPresent();
 
         // when
         mockMvc.perform(put("/api/users/Darth Vader")
             .with(csrf())
             .contentType(MediaType.APPLICATION_JSON)
-            .content("{\"username\": \"Darth Vader\",\"team\": {\"id\": \"Sith\"}}"))
+            .content("{\"username\": \"Darth Vader\",\"organization\": {\"id\": \"Sith\"}}"))
             .andDo(print())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.username", is("Darth Vader")))
             .andExpect(jsonPath("$.admin", is(false)))
-            .andExpect(jsonPath("$.team.id", is("Sith")));
+            .andExpect(jsonPath("$.organization.id", is("Sith")));
 
         // then
         assertThat(userRepository.findById("Darth Vader"))
             .isPresent()
-            .map(User::getTeam)
-            .hasValue(new Team("Sith"));
+            .map(User::getOrganization)
+            .hasValue(new Organization("Sith"));
     }
 
     @Test
@@ -129,7 +129,7 @@ void createUser_shouldSaveANewUser() throws Exception {
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.username", is("Obi Wan Kenobi")))
             .andExpect(jsonPath("$.admin", is(false)))
-            .andExpect(jsonPath("$.team", is(emptyOrNullString())));
+            .andExpect(jsonPath("$.organization", is(emptyOrNullString())));
 
         assertThat(userRepository.existsById("Obi Wan Kenobi")).isTrue();
     }
diff --git a/src/test/java/io/gaia_app/teams/controller/UsersRestControllerTest.java b/src/test/java/io/gaia_app/organizations/controller/UsersRestControllerTest.java
similarity index 90%
rename from src/test/java/io/gaia_app/teams/controller/UsersRestControllerTest.java
rename to src/test/java/io/gaia_app/organizations/controller/UsersRestControllerTest.java
index 3adf53f02..c1805ef89 100644
--- a/src/test/java/io/gaia_app/teams/controller/UsersRestControllerTest.java
+++ b/src/test/java/io/gaia_app/organizations/controller/UsersRestControllerTest.java
@@ -1,7 +1,7 @@
-package io.gaia_app.teams.controller;
+package io.gaia_app.organizations.controller;
 
-import io.gaia_app.teams.User;
-import io.gaia_app.teams.UserService;
+import io.gaia_app.organizations.User;
+import io.gaia_app.organizations.UserService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/src/test/java/io/gaia_app/teams/repository/UserRepositoryIT.kt b/src/test/java/io/gaia_app/organizations/repository/UserRepositoryIT.kt
similarity index 79%
rename from src/test/java/io/gaia_app/teams/repository/UserRepositoryIT.kt
rename to src/test/java/io/gaia_app/organizations/repository/UserRepositoryIT.kt
index 43e9f4ec6..b23a99260 100644
--- a/src/test/java/io/gaia_app/teams/repository/UserRepositoryIT.kt
+++ b/src/test/java/io/gaia_app/organizations/repository/UserRepositoryIT.kt
@@ -1,7 +1,7 @@
-package io.gaia_app.teams.repository
+package io.gaia_app.organizations.repository
 
-import io.gaia_app.teams.Team
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.Organization
+import io.gaia_app.organizations.User
 import io.gaia_app.test.SharedMongoContainerTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
@@ -17,7 +17,7 @@ class UserRepositoryIT: SharedMongoContainerTest() {
     @Test
     fun user_shouldBeSaved() {
         // given
-        val sam = User("Samantha Carter", Team("SG-1"))
+        val sam = User("Samantha Carter", Organization("SG-1"))
 
         // when
         userRepository.save(sam)
diff --git a/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerIT.kt b/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerIT.kt
index 36e018b6b..aaeb25698 100644
--- a/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerIT.kt
+++ b/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerIT.kt
@@ -6,8 +6,8 @@ import io.gaia_app.modules.bo.Variable
 import io.gaia_app.modules.repository.TerraformModuleRepository
 import io.gaia_app.registries.RegistryDetails
 import io.gaia_app.registries.RegistryType
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
 import io.gaia_app.test.SharedMongoContainerTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
diff --git a/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerTest.kt b/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerTest.kt
index 73922d680..ee777c447 100644
--- a/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerTest.kt
+++ b/src/test/java/io/gaia_app/registries/controller/GithubRegistryControllerTest.kt
@@ -4,7 +4,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.github.GithubRepository
 import io.gaia_app.registries.service.RegistryService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.InjectMocks
diff --git a/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerIT.kt b/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerIT.kt
index ae55db881..75971d799 100644
--- a/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerIT.kt
+++ b/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerIT.kt
@@ -6,8 +6,8 @@ import io.gaia_app.modules.bo.Variable
 import io.gaia_app.modules.repository.TerraformModuleRepository
 import io.gaia_app.registries.RegistryDetails
 import io.gaia_app.registries.RegistryType
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
 import io.gaia_app.test.SharedMongoContainerTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
diff --git a/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerTest.kt b/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerTest.kt
index c683f47e6..07c6e395d 100644
--- a/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerTest.kt
+++ b/src/test/java/io/gaia_app/registries/controller/GitlabRegistryControllerTest.kt
@@ -4,7 +4,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.gitlab.GitlabRepository
 import io.gaia_app.registries.service.RegistryService
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.InjectMocks
diff --git a/src/test/java/io/gaia_app/registries/github/GitHubRawContentTest.java b/src/test/java/io/gaia_app/registries/github/GitHubRawContentTest.java
index 684496899..c3543afd9 100644
--- a/src/test/java/io/gaia_app/registries/github/GitHubRawContentTest.java
+++ b/src/test/java/io/gaia_app/registries/github/GitHubRawContentTest.java
@@ -4,8 +4,8 @@
 import io.gaia_app.registries.RegistryFile;
 import io.gaia_app.registries.RegistryType;
 import io.gaia_app.modules.bo.TerraformModule;
-import io.gaia_app.teams.OAuth2User;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.OAuth2User;
+import io.gaia_app.organizations.User;
 import org.bson.internal.Base64;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/io/gaia_app/registries/github/GithubRegistryApiTest.kt b/src/test/java/io/gaia_app/registries/github/GithubRegistryApiTest.kt
index 05a5789f2..4a40abf21 100644
--- a/src/test/java/io/gaia_app/registries/github/GithubRegistryApiTest.kt
+++ b/src/test/java/io/gaia_app/registries/github/GithubRegistryApiTest.kt
@@ -2,8 +2,8 @@ package io.gaia_app.registries.github
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.gaia_app.registries.RegistryFile
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
 import org.assertj.core.api.Assertions.assertThat
 import org.bson.internal.Base64
 import org.junit.jupiter.api.Test
diff --git a/src/test/java/io/gaia_app/registries/gitlab/GitLabRawContentTest.java b/src/test/java/io/gaia_app/registries/gitlab/GitLabRawContentTest.java
index 462daf8f2..753fc9a97 100644
--- a/src/test/java/io/gaia_app/registries/gitlab/GitLabRawContentTest.java
+++ b/src/test/java/io/gaia_app/registries/gitlab/GitLabRawContentTest.java
@@ -4,8 +4,8 @@
 import io.gaia_app.registries.RegistryFile;
 import io.gaia_app.registries.RegistryType;
 import io.gaia_app.modules.bo.TerraformModule;
-import io.gaia_app.teams.OAuth2User;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.OAuth2User;
+import io.gaia_app.organizations.User;
 import org.bson.internal.Base64;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/io/gaia_app/registries/gitlab/GitlabRegistryApiTest.kt b/src/test/java/io/gaia_app/registries/gitlab/GitlabRegistryApiTest.kt
index d7dd2d17e..2217e7938 100644
--- a/src/test/java/io/gaia_app/registries/gitlab/GitlabRegistryApiTest.kt
+++ b/src/test/java/io/gaia_app/registries/gitlab/GitlabRegistryApiTest.kt
@@ -2,8 +2,8 @@ package io.gaia_app.registries.gitlab
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.gaia_app.registries.RegistryFile
-import io.gaia_app.teams.OAuth2User
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.OAuth2User
+import io.gaia_app.organizations.User
 import org.assertj.core.api.Assertions.assertThat
 import org.bson.internal.Base64
 import org.junit.jupiter.api.Test
diff --git a/src/test/java/io/gaia_app/registries/service/RegistryServiceImplTest.kt b/src/test/java/io/gaia_app/registries/service/RegistryServiceImplTest.kt
index 2a76c5510..d938ec1dd 100644
--- a/src/test/java/io/gaia_app/registries/service/RegistryServiceImplTest.kt
+++ b/src/test/java/io/gaia_app/registries/service/RegistryServiceImplTest.kt
@@ -9,7 +9,7 @@ import io.gaia_app.registries.RegistryApi
 import io.gaia_app.registries.RegistryType
 import io.gaia_app.registries.github.GithubRepository
 import io.gaia_app.registries.gitlab.GitlabRepository
-import io.gaia_app.teams.User
+import io.gaia_app.organizations.User
 import io.gaia_app.test.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
diff --git a/src/test/java/io/gaia_app/runner/RunnerCommandBuilderTest.java b/src/test/java/io/gaia_app/runner/RunnerCommandBuilderTest.java
index 71d60a50f..7644c8458 100644
--- a/src/test/java/io/gaia_app/runner/RunnerCommandBuilderTest.java
+++ b/src/test/java/io/gaia_app/runner/RunnerCommandBuilderTest.java
@@ -8,8 +8,8 @@
 import io.gaia_app.settings.bo.Settings;
 import io.gaia_app.stacks.bo.Job;
 import io.gaia_app.stacks.bo.Stack;
-import io.gaia_app.teams.OAuth2User;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.OAuth2User;
+import io.gaia_app.organizations.User;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/gaia_app/runner/RunnerControllerIT.java b/src/test/java/io/gaia_app/runner/RunnerControllerIT.java
index 53eec7a4d..a13b37547 100644
--- a/src/test/java/io/gaia_app/runner/RunnerControllerIT.java
+++ b/src/test/java/io/gaia_app/runner/RunnerControllerIT.java
@@ -51,7 +51,7 @@ class RunnerControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setUp() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("20_module.js");
         mongo.runScript("30_stack.js");
diff --git a/src/test/java/io/gaia_app/stacks/bo/JobTest.java b/src/test/java/io/gaia_app/stacks/bo/JobTest.java
index cc694af25..cba3f1662 100644
--- a/src/test/java/io/gaia_app/stacks/bo/JobTest.java
+++ b/src/test/java/io/gaia_app/stacks/bo/JobTest.java
@@ -1,6 +1,6 @@
 package io.gaia_app.stacks.bo;
 
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.User;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
diff --git a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerIT.java b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerIT.java
index f04f6ad8e..3cddaa392 100644
--- a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerIT.java
+++ b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerIT.java
@@ -17,7 +17,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Simple integration test that validates the security configuration of the TeamsRestController, and its http routes
+ * Simple integration test that validates the security configuration of the OrganizationsRestController, and its http routes
  */
 @SpringBootTest
 @AutoConfigureMockMvc
@@ -30,7 +30,7 @@ class StackRestControllerIT extends SharedMongoContainerTest {
     @BeforeEach
     void setUp() {
         mongo.emptyDatabase();
-        mongo.runScript("00_team.js");
+        mongo.runScript("00_organization.js");
         mongo.runScript("10_user.js");
         mongo.runScript("20_module.js");
         mongo.runScript("30_stack.js");
@@ -43,7 +43,7 @@ void listStacks_shouldReturnLimitedStacks_forStandardUsers() throws Exception {
             .andExpect(status().isOk())
             .andExpect(jsonPath("$", hasSize(1)))
             .andExpect(jsonPath("$[0]name", is("mongo-instance-limited")))
-            .andExpect(jsonPath("$[0]ownerTeam.id", is("Not Ze Team")));
+            .andExpect(jsonPath("$[0]ownerOrganization.id", is("Not Ze Organization")));
     }
 
     @Test
@@ -52,7 +52,7 @@ void listStacks_shouldReturnAllStacks_forAdmin() throws Exception {
             .andExpect(status().isOk())
             .andExpect(jsonPath("$", hasSize(5)))
             .andExpect(jsonPath("$.[*].name", contains("mongo-instance-1", "mongo-instance-2", "mongo-instance-limited", "local-mongo", "archived-stack")))
-            .andExpect(jsonPath("$.[*].ownerTeam.id", contains("Ze Team", "Ze Team", "Not Ze Team")));
+            .andExpect(jsonPath("$.[*].ownerOrganization.id", contains("Ze Organization", "Ze Organization", "Not Ze Organization")));
     }
 
     @Test
@@ -61,13 +61,13 @@ void getStacks_shouldReturnStack_forStandardUsers() throws Exception {
         mockMvc.perform(get("/api/stacks/845543d0-20a5-466c-8978-33c9a4661606"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.name", is("mongo-instance-limited")))
-            .andExpect(jsonPath("$.ownerTeam.id", is("Not Ze Team")))
+            .andExpect(jsonPath("$.ownerOrganization.id", is("Not Ze Organization")))
             .andExpect(jsonPath("$.estimatedRunningCost", is(0)));
     }
 
     @Test
     @WithMockUser("Mary J")
-    void getStacks_shouldNotReturnStackOfOtherTeams_forStandardUsers() throws Exception {
+    void getStacks_shouldNotReturnStackOfOtherOrganizations_forStandardUsers() throws Exception {
         mockMvc.perform(get("/api/stacks/5a215b6b-fe53-4afa-85f0-a10175a7f264"))
             .andExpect(status().isNotFound());
     }
@@ -77,7 +77,7 @@ void getStacks_shouldReturnStack_forAdmin() throws Exception {
         mockMvc.perform(get("/api/stacks/5a215b6b-fe53-4afa-85f0-a10175a7f264"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.name", is("mongo-instance-1")))
-            .andExpect(jsonPath("$.ownerTeam.id", is("Ze Team")))
+            .andExpect(jsonPath("$.ownerOrganization.id", is("Ze Organization")))
             .andExpect(jsonPath("$.estimatedRunningCost", is(0)));
     }
 
@@ -90,7 +90,7 @@ void saveStack_shouldBeAccessible_forStandardUser() throws Exception {
             .content("{\"name\":\"stack-test\", \"module\": {\"id\":\"e01f9925-a559-45a2-8a55-f93dc434c676\"}}"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.id", notNullValue()))
-            .andExpect(jsonPath("$.ownerTeam.id", is("Not Ze Team")))
+            .andExpect(jsonPath("$.ownerOrganization.id", is("Not Ze Organization")))
             .andExpect(jsonPath("$.createdBy.username", is("Mary J")))
             .andExpect(jsonPath("$.createdAt", notNullValue()));
     }
diff --git a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java
index b78b3e8bf..fa21521fc 100644
--- a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java
+++ b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java
@@ -6,8 +6,8 @@
 import io.gaia_app.stacks.repository.JobRepository;
 import io.gaia_app.stacks.repository.StackRepository;
 import io.gaia_app.stacks.service.StackCostCalculator;
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.User;
+import io.gaia_app.organizations.Organization;
+import io.gaia_app.organizations.User;
 import io.gaia_app.modules.bo.TerraformImage;
 import io.gaia_app.modules.bo.TerraformModule;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,11 +32,11 @@ class StackRestControllerTest {
 
     private User adminUser = new User("admin", null);
 
-    private Team userTeam = new Team("Red Is Dead");
+    private Organization userOrganization = new Organization("Red Is Dead");
 
-    private User standardUser = new User("Serge Karamazov", userTeam);
+    private User standardUser = new User("Serge Karamazov", userOrganization);
 
-    private User userWithNoTeam = new User("Émile Gravier", null);
+    private User userWithNoOrganization = new User("Émile Gravier", null);
 
     private Stack stack = new Stack();
 
@@ -70,21 +70,21 @@ void listStack_shouldFindAllStacks_forAdminUser() {
     }
 
     @Test
-    void listStack_shouldFindTeamStacks_forStandardUser() {
+    void listStack_shouldFindOrganizationStacks_forStandardUser() {
         // when
         stackRestController.listStacks(standardUser);
 
         // then
-        verify(stackRepository).findByOwnerTeam(userTeam);
+        verify(stackRepository).findByOwnerOrganization(userOrganization);
     }
 
     @Test
-    void listStack_shouldFindOwnedStacks_forUserWithNoTeam() {
+    void listStack_shouldFindOwnedStacks_forUserWithNoOrganization() {
         // when
-        stackRestController.listStacks(userWithNoTeam);
+        stackRestController.listStacks(userWithNoOrganization);
 
         // then
-        verify(stackRepository).findByCreatedBy(userWithNoTeam);
+        verify(stackRepository).findByCreatedBy(userWithNoOrganization);
     }
 
     @Test
@@ -102,22 +102,22 @@ void getStack_shouldFindStack_forAdminUser() {
     @Test
     void getStack_shouldFindStack_forStandardUser() {
         // given
-        when(stackRepository.findByIdAndOwnerTeam("42", userTeam)).thenReturn(Optional.of(stack));
+        when(stackRepository.findByIdAndOwnerOrganization("42", userOrganization)).thenReturn(Optional.of(stack));
 
         // when
         stackRestController.getStack("42", standardUser);
 
         // then
-        verify(stackRepository).findByIdAndOwnerTeam("42", userTeam);
+        verify(stackRepository).findByIdAndOwnerOrganization("42", userOrganization);
     }
 
     @Test
-    void getStack_shouldFindStack_forUserWithNoTeam() {
+    void getStack_shouldFindStack_forUserWithNoOrganization() {
         // given
         when(stackRepository.findById("42")).thenReturn(Optional.of(stack));
 
         // when
-        stackRestController.getStack("42", userWithNoTeam);
+        stackRestController.getStack("42", userWithNoOrganization);
 
         // then
         verify(stackRepository).findById("42");
@@ -126,13 +126,13 @@ void getStack_shouldFindStack_forUserWithNoTeam() {
     @Test
     void getStack_shouldCalculateRunningCost_forStandardUser() {
         // given
-        when(stackRepository.findByIdAndOwnerTeam("42", userTeam)).thenReturn(Optional.of(stack));
+        when(stackRepository.findByIdAndOwnerOrganization("42", userOrganization)).thenReturn(Optional.of(stack));
 
         // when
         stackRestController.getStack("42", standardUser);
 
         // then
-        verify(stackRepository).findByIdAndOwnerTeam("42", userTeam);
+        verify(stackRepository).findByIdAndOwnerOrganization("42", userOrganization);
         verify(stackCostCalculator).calculateRunningCostEstimation(stack);
     }
 
@@ -140,7 +140,7 @@ void getStack_shouldCalculateRunningCost_forStandardUser() {
     void getStack_shouldThrowStackNotFoundException() {
         // given
         when(stackRepository.findById("12")).thenReturn(Optional.empty());
-        when(stackRepository.findByIdAndOwnerTeam("42", userTeam)).thenReturn(Optional.empty());
+        when(stackRepository.findByIdAndOwnerOrganization("42", userOrganization)).thenReturn(Optional.empty());
 
         // when/then
         assertThrows(StackNotFoundException.class, () -> stackRestController.getStack("12", adminUser));
@@ -150,11 +150,11 @@ void getStack_shouldThrowStackNotFoundException() {
     @Test
     void save_shouldSaveStack() {
         // when
-        stackRestController.save(stack, userTeam, standardUser);
+        stackRestController.save(stack, userOrganization, standardUser);
 
         // then
         assertThat(stack.getId()).isNotBlank();
-        assertThat(stack.getOwnerTeam()).isEqualTo(userTeam);
+        assertThat(stack.getOwnerOrganization()).isEqualTo(userOrganization);
         assertThat(stack.getCreatedBy()).isEqualTo(standardUser);
         assertThat(stack.getCreatedAt()).isEqualToIgnoringSeconds(LocalDateTime.now());
         verify(stackRepository).save(stack);
diff --git a/src/test/java/io/gaia_app/stacks/repository/StackRepositoryIT.java b/src/test/java/io/gaia_app/stacks/repository/StackRepositoryIT.java
index 2831c8d0a..44ee496ab 100644
--- a/src/test/java/io/gaia_app/stacks/repository/StackRepositoryIT.java
+++ b/src/test/java/io/gaia_app/stacks/repository/StackRepositoryIT.java
@@ -2,7 +2,7 @@
 
 import io.gaia_app.stacks.bo.Stack;
 import io.gaia_app.stacks.bo.StackState;
-import io.gaia_app.teams.Team;
+import io.gaia_app.organizations.Organization;
 import io.gaia_app.test.SharedMongoContainerTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,56 +29,56 @@ void setUp() {
     @Test
     void findAllByState_shouldFindStacksByTheirState(){
         // given
-        var team = new Team("userTeam");
+        var organization = new Organization("userOrganization");
 
         var stackRunning1 = new Stack();
         stackRunning1.setId("1");
         stackRunning1.setState(StackState.RUNNING);
-        stackRunning1.setOwnerTeam(team);
+        stackRunning1.setOwnerOrganization(organization);
 
         var stackRunning2 = new Stack();
         stackRunning2.setId("2");
         stackRunning2.setState(StackState.RUNNING);
-        stackRunning2.setOwnerTeam(team);
+        stackRunning2.setOwnerOrganization(organization);
 
         var stackToUpdate1 = new Stack();
         stackToUpdate1.setId("3");
         stackToUpdate1.setState(StackState.TO_UPDATE);
-        stackToUpdate1.setOwnerTeam(team);
+        stackToUpdate1.setOwnerOrganization(organization);
 
         stackRepository.saveAll(List.of(stackRunning1, stackRunning2, stackToUpdate1));
 
         // when
-        var result = stackRepository.countStacksByStateAndOwnerTeam(StackState.RUNNING, team);
+        var result = stackRepository.countStacksByStateAndOwnerOrganization(StackState.RUNNING, organization);
 
         // then
         assertEquals(2, result);
     }
 
     @Test
-    void stacks_shouldBeVisibleByTheirOwnerTeam(){
+    void stacks_shouldBeVisibleByTheirOwnerOrganization(){
         // given
 
-        // sample teams
-        var team1 = new Team("team1");
-        var team2 = new Team("team2");
+        // sample organizations
+        var organization1 = new Organization("organization1");
+        var organization2 = new Organization("organization2");
 
         var stack1 = new Stack();
         stack1.setId("1");
-        stack1.setOwnerTeam(team1);
+        stack1.setOwnerOrganization(organization1);
 
         var stack2 = new Stack();
         stack2.setId("2");
-        stack2.setOwnerTeam(team1);
+        stack2.setOwnerOrganization(organization1);
 
         var stack3 = new Stack();
         stack3.setId("3");
-        stack3.setOwnerTeam(team2);
+        stack3.setOwnerOrganization(organization2);
 
         stackRepository.saveAll(List.of(stack1, stack2, stack3));
 
         // when
-        var result = stackRepository.findByOwnerTeam(team1);
+        var result = stackRepository.findByOwnerOrganization(organization1);
 
         // then
         assertThat(result).hasSize(2)
diff --git a/src/test/java/io/gaia_app/teams/controller/TeamsRestControllerTest.java b/src/test/java/io/gaia_app/teams/controller/TeamsRestControllerTest.java
deleted file mode 100644
index 334018793..000000000
--- a/src/test/java/io/gaia_app/teams/controller/TeamsRestControllerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.gaia_app.teams.controller;
-
-import io.gaia_app.teams.Team;
-import io.gaia_app.teams.repository.TeamRepository;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class TeamsRestControllerTest {
-
-    @Mock
-    private TeamRepository teamRepository;
-
-    @InjectMocks
-    private TeamsRestController teamsRestController;
-
-    @Test
-    void teams_shouldReturnAllTeams() {
-        // given
-        var a = new Team("A");
-        when(teamRepository.findAll()).thenReturn(List.of(a));
-
-        // when
-        var teams = teamsRestController.teams();
-
-        // then
-        assertThat(teams).contains(a);
-        verify(teamRepository).findAll();
-    }
-}
diff --git a/src/test/resources/db/00_organization.js b/src/test/resources/db/00_organization.js
new file mode 100644
index 000000000..3c6b0a5f6
--- /dev/null
+++ b/src/test/resources/db/00_organization.js
@@ -0,0 +1,13 @@
+let gaia = db.getSiblingDB('gaia');
+gaia.organization.drop();
+gaia.organization.insert([
+    {
+        "_id": "Ze Organization"
+    },
+    {
+        "_id": "Not Ze Organization"
+    },
+    {
+        "_id": "Sith"
+    }
+]);
diff --git a/src/test/resources/db/00_team.js b/src/test/resources/db/00_team.js
deleted file mode 100644
index dd037b607..000000000
--- a/src/test/resources/db/00_team.js
+++ /dev/null
@@ -1,13 +0,0 @@
-let gaia = db.getSiblingDB('gaia');
-gaia.team.drop();
-gaia.team.insert([
-    {
-        "_id": "Ze Team"
-    },
-    {
-        "_id": "Not Ze Team"
-    },
-    {
-        "_id": "Sith"
-    }
-]);
\ No newline at end of file
diff --git a/src/test/resources/db/10_user.js b/src/test/resources/db/10_user.js
index d6dfb8434..fff1b61e1 100644
--- a/src/test/resources/db/10_user.js
+++ b/src/test/resources/db/10_user.js
@@ -3,14 +3,14 @@ gaia.user.drop();
 gaia.user.insert([
     {
         "_id": "admin",
-        "team": {"$ref": "team", "$id": "Ze Team"},
+        "organization": {"$ref": "organization", "$id": "Ze Organization"},
         "isAdmin": true,
         // admin123
         "password": "$2a$10$hr8QjaJ0ync5OQoCtoown.XKplCdhAnyfkWaCf9fto9Cd4470hO/e"
     },
     {
         "_id": "Mary J",
-        "team": {"$ref": "team", "$id": "Not Ze Team"}
+        "organization": {"$ref": "organization", "$id": "Not Ze Organization"}
     }
     ,
     {
diff --git a/src/test/resources/db/20_module.js b/src/test/resources/db/20_module.js
index c3d5bbb87..5f6a0bc7c 100644
--- a/src/test/resources/db/20_module.js
+++ b/src/test/resources/db/20_module.js
@@ -12,7 +12,7 @@ gaia.terraformModule.insert([
             "repository": "hashicorp/terraform",
             "tag": "0.11.14"
         },
-        "authorizedTeams": [{"$ref": "team", "$id": "Ze Team"}],
+        "authorizedOrganizations": [{"$ref": "organization", "$id": "Ze Organization"}],
         "moduleMetadata": {
             "createdAt": "2020-08-07T14:32:22.015+00:00",
             "createdBy": {"$ref": "user", "$id": "admin"}
@@ -41,7 +41,7 @@ gaia.terraformModule.insert([
     {
         "_id": "845543d0-20a5-466c-8978-33c9a4661606",
         "name": "terraform-docker-mongo-limited",
-        "description": "A module only visible by admin and team Not Ze Team",
+        "description": "A module only visible by admin and organization Not Ze Organization",
         "gitRepositoryUrl": "https://github.com/juwit/terraform-docker-mongo.git",
         "directory": null,
         "gitBranch": "master",
@@ -49,7 +49,7 @@ gaia.terraformModule.insert([
             "repository": "hashicorp/terraform",
             "tag": "0.11.14"
         },
-        "authorizedTeams": [{"$ref": "team", "$id": "Not Ze Team"}],
+        "authorizedOrganizations": [{"$ref": "organization", "$id": "Not Ze Organization"}],
         "moduleMetadata": {
             "createdBy": {"$ref": "user", "$id": "admin"}
         },
@@ -70,7 +70,7 @@ gaia.terraformModule.insert([
             "repository": "hashicorp/terraform",
             "tag": "0.11.14"
         },
-        "authorizedTeams": [{"$ref": "team", "$id": "Ze Team"}],
+        "authorizedOrganizations": [{"$ref": "organization", "$id": "Ze Organization"}],
         "moduleMetadata": {
             "createdBy": {"$ref": "user", "$id": "admin"}
         },
diff --git a/src/test/resources/db/30_stack.js b/src/test/resources/db/30_stack.js
index b06700b10..8815c9620 100644
--- a/src/test/resources/db/30_stack.js
+++ b/src/test/resources/db/30_stack.js
@@ -12,7 +12,7 @@ gaia.stack.insert([
     },
     'providerSpec': 'provider "docker" {\n    host = "unix:///var/run/docker.sock"\n}',
     'state': 'NEW',
-    'ownerTeam': { '$ref': 'team', '$id': 'Ze Team' },
+    'ownerOrganization': { '$ref': 'organization', '$id': 'Ze Organization' },
     'estimatedRunningCost': null,
     'createdBy': { '$ref': 'user', '$id': 'admin' },
     'createdAt': new Date(),
@@ -27,7 +27,7 @@ gaia.stack.insert([
     'variablesValues': {},
     'providerSpec': null,
     'state': 'NEW',
-    'ownerTeam': { '$ref': 'team', '$id': 'Ze Team' },
+    'ownerOrganization': { '$ref': 'organization', '$id': 'Ze Organization' },
     'estimatedRunningCost': null,
     'createdBy': { '$ref': 'user', '$id': 'admin' },
     'createdAt': new Date(),
@@ -38,11 +38,11 @@ gaia.stack.insert([
     '_id': '845543d0-20a5-466c-8978-33c9a4661606',
     'module': { '$ref': 'terraformModule', '$id': 'e01f9925-a559-45a2-8a55-f93dc434c676' },
     'name': 'mongo-instance-limited',
-    'description': 'instance of mongo module for team Not Ze Team',
+    'description': 'instance of mongo module for organization Not Ze Organization',
     'variablesValues': {},
     'providerSpec': null,
     'state': 'NEW',
-    'ownerTeam': { '$ref': 'team', '$id': 'Not Ze Team' },
+    'ownerOrganization': { '$ref': 'organization', '$id': 'Not Ze Organization' },
     'estimatedRunningCost': null,
     'createdBy': { '$ref': 'user', '$id': 'Mary J' },
     'createdAt': new Date(),
diff --git a/src/test/resources/rest/github/selmak-public-repos.json b/src/test/resources/rest/github/selmak-public-repos.json
index dbc4dafc1..7df00e675 100644
--- a/src/test/resources/rest/github/selmak-public-repos.json
+++ b/src/test/resources/rest/github/selmak-public-repos.json
@@ -32,7 +32,7 @@
     "forks_url": "https://api.github.com/repos/selmak/terraform-aws-eks/forks",
     "keys_url": "https://api.github.com/repos/selmak/terraform-aws-eks/keys{/key_id}",
     "collaborators_url": "https://api.github.com/repos/selmak/terraform-aws-eks/collaborators{/collaborator}",
-    "teams_url": "https://api.github.com/repos/selmak/terraform-aws-eks/teams",
+    "organizations_url": "https://api.github.com/repos/selmak/terraform-aws-eks/organizations",
     "hooks_url": "https://api.github.com/repos/selmak/terraform-aws-eks/hooks",
     "issue_events_url": "https://api.github.com/repos/selmak/terraform-aws-eks/issues/events{/number}",
     "events_url": "https://api.github.com/repos/selmak/terraform-aws-eks/events",
@@ -137,7 +137,7 @@
     "forks_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/forks",
     "keys_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/keys{/key_id}",
     "collaborators_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/collaborators{/collaborator}",
-    "teams_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/teams",
+    "organizations_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/organizations",
     "hooks_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/hooks",
     "issue_events_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/issues/events{/number}",
     "events_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/events",
@@ -236,7 +236,7 @@
     "forks_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/forks",
     "keys_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/keys{/key_id}",
     "collaborators_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/collaborators{/collaborator}",
-    "teams_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/teams",
+    "organizations_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/organizations",
     "hooks_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/hooks",
     "issue_events_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/issues/events{/number}",
     "events_url": "https://api.github.com/repos/selmak/terraform-provider-aws-examples/events",
@@ -302,4 +302,4 @@
       "pull": true
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/test/resources/rest/github/selmak-terraform-docker-mongo.json b/src/test/resources/rest/github/selmak-terraform-docker-mongo.json
index c27549b9c..69c294bef 100644
--- a/src/test/resources/rest/github/selmak-terraform-docker-mongo.json
+++ b/src/test/resources/rest/github/selmak-terraform-docker-mongo.json
@@ -31,7 +31,7 @@
   "forks_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/forks",
   "keys_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/keys{/key_id}",
   "collaborators_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/collaborators{/collaborator}",
-  "teams_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/teams",
+  "organizations_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/organizations",
   "hooks_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/hooks",
   "issue_events_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/issues/events{/number}",
   "events_url": "https://api.github.com/repos/selmak/terraform-docker-mongo/events",
@@ -103,4 +103,4 @@
   "delete_branch_on_merge": false,
   "network_count": 1,
   "subscribers_count": 1
-}
\ No newline at end of file
+}