diff --git a/src/Api/Controllers/SubvaultUsersController.cs b/src/Api/Controllers/CollectionUsersController.cs
similarity index 100%
rename from src/Api/Controllers/SubvaultUsersController.cs
rename to src/Api/Controllers/CollectionUsersController.cs
diff --git a/src/Api/Controllers/SubvaultsController.cs b/src/Api/Controllers/CollectionsController.cs
similarity index 100%
rename from src/Api/Controllers/SubvaultsController.cs
rename to src/Api/Controllers/CollectionsController.cs
diff --git a/src/Core/Models/Api/Request/SubvaultRequestModel.cs b/src/Core/Models/Api/Request/CollectionRequestModel.cs
similarity index 100%
rename from src/Core/Models/Api/Request/SubvaultRequestModel.cs
rename to src/Core/Models/Api/Request/CollectionRequestModel.cs
diff --git a/src/Core/Models/Api/Request/SubvaultUserRequestModel.cs b/src/Core/Models/Api/Request/CollectionUserRequestModel.cs
similarity index 100%
rename from src/Core/Models/Api/Request/SubvaultUserRequestModel.cs
rename to src/Core/Models/Api/Request/CollectionUserRequestModel.cs
diff --git a/src/Core/Models/Api/Response/SubvaultResponseModel.cs b/src/Core/Models/Api/Response/CollectionResponseModel.cs
similarity index 100%
rename from src/Core/Models/Api/Response/SubvaultResponseModel.cs
rename to src/Core/Models/Api/Response/CollectionResponseModel.cs
diff --git a/src/Core/Models/Api/Response/SubvaultUserResponseModel.cs b/src/Core/Models/Api/Response/CollectionUserResponseModel.cs
similarity index 100%
rename from src/Core/Models/Api/Response/SubvaultUserResponseModel.cs
rename to src/Core/Models/Api/Response/CollectionUserResponseModel.cs
diff --git a/src/Core/Models/Api/Response/OrganizationUserSubvaultResponseModel.cs b/src/Core/Models/Api/Response/OrganizationUserCollectionResponseModel.cs
similarity index 100%
rename from src/Core/Models/Api/Response/OrganizationUserSubvaultResponseModel.cs
rename to src/Core/Models/Api/Response/OrganizationUserCollectionResponseModel.cs
diff --git a/src/Core/Models/Data/SubvaultUserSubvaultDetails.cs b/src/Core/Models/Data/CollectionUserCollectionDetails.cs
similarity index 100%
rename from src/Core/Models/Data/SubvaultUserSubvaultDetails.cs
rename to src/Core/Models/Data/CollectionUserCollectionDetails.cs
diff --git a/src/Core/Models/Data/SubvaultUserUserDetails.cs b/src/Core/Models/Data/CollectionUserUserDetails.cs
similarity index 100%
rename from src/Core/Models/Data/SubvaultUserUserDetails.cs
rename to src/Core/Models/Data/CollectionUserUserDetails.cs
diff --git a/src/Core/Models/Table/Subvault.cs b/src/Core/Models/Table/Collection.cs
similarity index 100%
rename from src/Core/Models/Table/Subvault.cs
rename to src/Core/Models/Table/Collection.cs
diff --git a/src/Core/Models/Table/SubvaultCipher.cs b/src/Core/Models/Table/CollectionCipher.cs
similarity index 100%
rename from src/Core/Models/Table/SubvaultCipher.cs
rename to src/Core/Models/Table/CollectionCipher.cs
diff --git a/src/Core/Models/Table/SubvaultUser.cs b/src/Core/Models/Table/CollectionUser.cs
similarity index 100%
rename from src/Core/Models/Table/SubvaultUser.cs
rename to src/Core/Models/Table/CollectionUser.cs
diff --git a/src/Core/Repositories/ISubvaultCipherRepository.cs b/src/Core/Repositories/ICollectionCipherRepository.cs
similarity index 100%
rename from src/Core/Repositories/ISubvaultCipherRepository.cs
rename to src/Core/Repositories/ICollectionCipherRepository.cs
diff --git a/src/Core/Repositories/ISubvaultRepository.cs b/src/Core/Repositories/ICollectionRepository.cs
similarity index 100%
rename from src/Core/Repositories/ISubvaultRepository.cs
rename to src/Core/Repositories/ICollectionRepository.cs
diff --git a/src/Core/Repositories/ISubvaultUserRepository.cs b/src/Core/Repositories/ICollectionUserRepository.cs
similarity index 100%
rename from src/Core/Repositories/ISubvaultUserRepository.cs
rename to src/Core/Repositories/ICollectionUserRepository.cs
diff --git a/src/Core/Repositories/SqlServer/SubvaultCipherRepository.cs b/src/Core/Repositories/SqlServer/CollectionCipherRepository.cs
similarity index 100%
rename from src/Core/Repositories/SqlServer/SubvaultCipherRepository.cs
rename to src/Core/Repositories/SqlServer/CollectionCipherRepository.cs
diff --git a/src/Core/Repositories/SqlServer/SubvaultRepository.cs b/src/Core/Repositories/SqlServer/CollectionRepository.cs
similarity index 100%
rename from src/Core/Repositories/SqlServer/SubvaultRepository.cs
rename to src/Core/Repositories/SqlServer/CollectionRepository.cs
diff --git a/src/Core/Repositories/SqlServer/SubvaultUserRepository.cs b/src/Core/Repositories/SqlServer/CollectionUserRepository.cs
similarity index 100%
rename from src/Core/Repositories/SqlServer/SubvaultUserRepository.cs
rename to src/Core/Repositories/SqlServer/CollectionUserRepository.cs
diff --git a/src/Core/Services/ISubvaultService.cs b/src/Core/Services/ICollectionService.cs
similarity index 100%
rename from src/Core/Services/ISubvaultService.cs
rename to src/Core/Services/ICollectionService.cs
diff --git a/src/Core/Services/Implementations/SubvaultService.cs b/src/Core/Services/Implementations/CollectionService.cs
similarity index 100%
rename from src/Core/Services/Implementations/SubvaultService.cs
rename to src/Core/Services/Implementations/CollectionService.cs