diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index c8788a3d7f..1bcd66b726 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -67,117 +67,117 @@
     <Folder Include="dbo\User Defined Types\" />
   </ItemGroup>
   <ItemGroup>
-    <Build Include="dbo\Tables\SubvaultCipher.sql" />
-    <Build Include="dbo\Tables\SubvaultGroup.sql" />
-    <Build Include="dbo\Tables\SubvaultUser.sql" />
-    <Build Include="dbo\Tables\User.sql" />
-    <Build Include="dbo\Tables\OrganizationUser.sql" />
-    <Build Include="dbo\Tables\Cipher.sql" />
+    <Build Include="dbo\Tables\Grant.sql" />
+    <Build Include="dbo\Tables\Collection.sql" />
+    <Build Include="dbo\Tables\CollectionCipher.sql" />
+    <Build Include="dbo\Tables\CollectionGroup.sql" />
+    <Build Include="dbo\Tables\CollectionUser.sql" />
     <Build Include="dbo\Tables\Device.sql" />
     <Build Include="dbo\Tables\Folder.sql" />
-    <Build Include="dbo\Tables\Grant.sql" />
+    <Build Include="dbo\Tables\Cipher.sql" />
+    <Build Include="dbo\Tables\User.sql" />
     <Build Include="dbo\Tables\Group.sql" />
     <Build Include="dbo\Tables\GroupUser.sql" />
     <Build Include="dbo\Tables\Organization.sql" />
-    <Build Include="dbo\Tables\Subvault.sql" />
+    <Build Include="dbo\Tables\OrganizationUser.sql" />
+    <Build Include="dbo\Views\GrantView.sql" />
+    <Build Include="dbo\Views\UserView.sql" />
+    <Build Include="dbo\Views\CollectionUserCollectionDetailsView.sql" />
+    <Build Include="dbo\Views\CollectionUserUserDetailsView.sql" />
+    <Build Include="dbo\Views\CollectionUserView.sql" />
+    <Build Include="dbo\Views\CollectionView.sql" />
     <Build Include="dbo\Views\CipherView.sql" />
     <Build Include="dbo\Views\DeviceView.sql" />
     <Build Include="dbo\Views\FolderView.sql" />
-    <Build Include="dbo\Views\GrantView.sql" />
     <Build Include="dbo\Views\OrganizationUserOrganizationDetailsView.sql" />
     <Build Include="dbo\Views\OrganizationUserUserDetailsView.sql" />
     <Build Include="dbo\Views\OrganizationUserView.sql" />
     <Build Include="dbo\Views\OrganizationView.sql" />
-    <Build Include="dbo\Views\SubvaultUserSubvaultDetailsView.sql" />
-    <Build Include="dbo\Views\SubvaultUserUserDetailsView.sql" />
-    <Build Include="dbo\Views\SubvaultUserView.sql" />
-    <Build Include="dbo\Views\SubvaultView.sql" />
-    <Build Include="dbo\Views\UserView.sql" />
     <Build Include="dbo\Functions\UserCanEditCipher.sql" />
     <Build Include="dbo\Functions\CipherDetails.sql" />
-    <Build Include="dbo\Stored Procedures\User_UpdateEmailPassword.sql" />
-    <Build Include="dbo\Stored Procedures\User_Update.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
-    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
-    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\User_Create.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUserUserDetails_ReadBySubvaultId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUserSubvaultDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadCanEditByCipherIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadByOrganizationUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaultsAdmin.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_UpdateSubvaults.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserIdCipherId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_Delete.sql" />
-    <Build Include="dbo\Stored Procedures\SubvaultCipher_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Subvault_Create.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_ReadBySubjectId.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientIdType.sql" />
-    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientId.sql" />
     <Build Include="dbo\Stored Procedures\Grant_DeleteByKey.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\Device_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenByIdentifier.sql" />
-    <Build Include="dbo\Stored Procedures\CipherFullDetails_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserIdHasSubvault.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByTypeUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithSubvaults.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientId.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_DeleteBySubjectIdClientIdType.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_ReadByKey.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_ReadBySubjectId.sql" />
+    <Build Include="dbo\Stored Procedures\Grant_Save.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadAccountRevisionDateById.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDate.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadPublicKeyById.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_Create.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_UpdateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserIdHasCollection.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_Update.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_Create.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_Delete.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserIdCipherId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollections.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollectionsAdmin.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_ReadByOrganizationUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_ReadCanEditByCipherIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUserCollectionDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUserUserDetails_ReadByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
+    <Build Include="dbo\Stored Procedures\Device_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByIdentifierUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Device_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_Create.sql" />
+    <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
+    <Build Include="dbo\Stored Procedures\User_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\User_Update.sql" />
+    <Build Include="dbo\Stored Procedures\User_UpdateEmailPassword.sql" />
+    <Build Include="dbo\Stored Procedures\Device_ClearPushTokenByIdentifier.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByTypeUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherDetails_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\CipherFullDetails_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Create.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Organization_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Create.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_DeleteById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadById.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByFreeOrganizationAdminUser.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_ReadCountByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_Update.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserOrganizationDetails_ReadByUserIdStatus.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUserUserDetails_ReadById.sql" />
     <Build Include="dbo\User Defined Types\GuidIdArray.sql" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasSubvault.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasCollection.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasSubvault.sql
rename to src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasCollection.sql
diff --git a/src/Sql/dbo/Stored Procedures/Cipher_UpdateWithSubvaults.sql b/src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Cipher_UpdateWithSubvaults.sql
rename to src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_Create.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_Create.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_Create.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_Create.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_Delete.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_Delete.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_Delete.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_Delete.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByOrganizationId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByOrganizationId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByOrganizationId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserIdCipherId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserIdCipherId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserIdCipherId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserIdCipherId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaults.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollections.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaults.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollections.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaultsAdmin.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollectionsAdmin.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaultsAdmin.sql
rename to src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollectionsAdmin.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUserSubvaultDetails_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUserCollectionDetails_ReadByUserId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUserSubvaultDetails_ReadByUserId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUserCollectionDetails_ReadByUserId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUserUserDetails_ReadBySubvaultId.sql b/src/Sql/dbo/Stored Procedures/CollectionUserUserDetails_ReadByCollectionId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUserUserDetails_ReadBySubvaultId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUserUserDetails_ReadByCollectionId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_Create.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_Create.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_DeleteById.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_DeleteById.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_DeleteById.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_DeleteById.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadById.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadById.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadById.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadById.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadByOrganizationUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadByOrganizationUserId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadByOrganizationUserId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadByOrganizationUserId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadCanEditByCipherIdUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadCanEditByCipherIdUserId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadCanEditByCipherIdUserId.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadCanEditByCipherIdUserId.sql
diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_Update.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql
rename to src/Sql/dbo/Stored Procedures/CollectionUser_Update.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_Create.sql b/src/Sql/dbo/Stored Procedures/Collection_Create.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_Create.sql
rename to src/Sql/dbo/Stored Procedures/Collection_Create.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Collection_DeleteById.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_DeleteById.sql
rename to src/Sql/dbo/Stored Procedures/Collection_DeleteById.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadById.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadById.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_ReadById.sql
rename to src/Sql/dbo/Stored Procedures/Collection_ReadById.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadByOrganizationId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationId.sql
rename to src/Sql/dbo/Stored Procedures/Collection_ReadByOrganizationId.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadByUserId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_ReadByUserId.sql
rename to src/Sql/dbo/Stored Procedures/Collection_ReadByUserId.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadCountByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadCountByOrganizationId.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_ReadCountByOrganizationId.sql
rename to src/Sql/dbo/Stored Procedures/Collection_ReadCountByOrganizationId.sql
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_Update.sql b/src/Sql/dbo/Stored Procedures/Collection_Update.sql
similarity index 100%
rename from src/Sql/dbo/Stored Procedures/Subvault_Update.sql
rename to src/Sql/dbo/Stored Procedures/Collection_Update.sql
diff --git a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql
index 333ec87461..b5086eb7e8 100644
--- a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql	
+++ b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql	
@@ -10,4 +10,4 @@ BEGIN
         [PushToken] = NULL
     WHERE
         [Identifier] = @Identifier
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql
index eb9b1474b0..4a6abfc479 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql	
@@ -9,4 +9,4 @@ BEGIN
         [dbo].[Grant]
     WHERE
         [Key] = @Key
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql
index 7b98477e98..48d5036cbb 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql	
@@ -11,4 +11,4 @@ BEGIN
     WHERE
         [SubjectId] = @SubjectId
         AND [ClientId] = @ClientId
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql
index 0e75baa373..5f7c483735 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql	
@@ -13,4 +13,4 @@ BEGIN
         [SubjectId] = @SubjectId
         AND [ClientId] = @ClientId
         AND [Type] = @Type
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql b/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql
index 414388b12a..e853a51904 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[GrantView]
     WHERE
         [Key] = @Key
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql b/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql
index 738ec57f00..f4270b2e65 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql	
@@ -10,4 +10,4 @@ BEGIN
         [dbo].[GrantView]
     WHERE
         [SubjectId] = @SubjectId
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/Grant_Save.sql b/src/Sql/dbo/Stored Procedures/Grant_Save.sql
index af6b2a7e70..097fd6c254 100644
--- a/src/Sql/dbo/Stored Procedures/Grant_Save.sql	
+++ b/src/Sql/dbo/Stored Procedures/Grant_Save.sql	
@@ -67,4 +67,4 @@ BEGIN
             [Source].[Data]
         )
     ;
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql
index 24a50b28b2..40eb9773bc 100644
--- a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql	
@@ -11,4 +11,4 @@ BEGIN
         [dbo].[User]
     WHERE
         [Id] = @Id
-END
\ No newline at end of file
+END
diff --git a/src/Sql/dbo/Tables/Subvault.sql b/src/Sql/dbo/Tables/Collection.sql
similarity index 100%
rename from src/Sql/dbo/Tables/Subvault.sql
rename to src/Sql/dbo/Tables/Collection.sql
diff --git a/src/Sql/dbo/Tables/SubvaultCipher.sql b/src/Sql/dbo/Tables/CollectionCipher.sql
similarity index 92%
rename from src/Sql/dbo/Tables/SubvaultCipher.sql
rename to src/Sql/dbo/Tables/CollectionCipher.sql
index 906ffced63..f661cb6fbd 100644
--- a/src/Sql/dbo/Tables/SubvaultCipher.sql
+++ b/src/Sql/dbo/Tables/CollectionCipher.sql
@@ -1,6 +1,6 @@
 CREATE TABLE [dbo].[CollectionCipher] (
     [CollectionId] UNIQUEIDENTIFIER NOT NULL,
-    [CipherId]   UNIQUEIDENTIFIER NOT NULL,
+    [CipherId]     UNIQUEIDENTIFIER NOT NULL,
     CONSTRAINT [PK_CollectionCipher] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [CipherId] ASC),
     CONSTRAINT [FK_CollectionCipher_Cipher] FOREIGN KEY ([CipherId]) REFERENCES [dbo].[Cipher] ([Id]) ON DELETE CASCADE,
     CONSTRAINT [FK_CollectionCipher_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE
diff --git a/src/Sql/dbo/Tables/SubvaultGroup.sql b/src/Sql/dbo/Tables/CollectionGroup.sql
similarity index 68%
rename from src/Sql/dbo/Tables/SubvaultGroup.sql
rename to src/Sql/dbo/Tables/CollectionGroup.sql
index 87b386f866..9206c83dd5 100644
--- a/src/Sql/dbo/Tables/SubvaultGroup.sql
+++ b/src/Sql/dbo/Tables/CollectionGroup.sql
@@ -1,8 +1,8 @@
 CREATE TABLE [dbo].[CollectionGroup] (
     [CollectionId] UNIQUEIDENTIFIER NOT NULL,
-    [GroupId]    UNIQUEIDENTIFIER NOT NULL,
+    [GroupId]      UNIQUEIDENTIFIER NOT NULL,
     CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC),
-    CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE,
-    CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id])
+    CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]),
+    CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE
 );
 
diff --git a/src/Sql/dbo/Tables/SubvaultUser.sql b/src/Sql/dbo/Tables/CollectionUser.sql
similarity index 92%
rename from src/Sql/dbo/Tables/SubvaultUser.sql
rename to src/Sql/dbo/Tables/CollectionUser.sql
index 580c0a30ee..10dbdd8d79 100644
--- a/src/Sql/dbo/Tables/SubvaultUser.sql
+++ b/src/Sql/dbo/Tables/CollectionUser.sql
@@ -1,13 +1,13 @@
 CREATE TABLE [dbo].[CollectionUser] (
     [Id]                 UNIQUEIDENTIFIER NOT NULL,
-    [CollectionId]         UNIQUEIDENTIFIER NOT NULL,
+    [CollectionId]       UNIQUEIDENTIFIER NOT NULL,
     [OrganizationUserId] UNIQUEIDENTIFIER NOT NULL,
     [ReadOnly]           BIT              NOT NULL,
     [CreationDate]       DATETIME2 (7)    NOT NULL,
     [RevisionDate]       DATETIME2 (7)    NOT NULL,
     CONSTRAINT [PK_CollectionUser] PRIMARY KEY CLUSTERED ([Id] ASC),
-    CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id]),
-    CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE
+    CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE,
+    CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id])
 );
 
 
diff --git a/src/Sql/dbo/Tables/Organization.sql b/src/Sql/dbo/Tables/Organization.sql
index 9b7c1fa912..ba98350895 100644
--- a/src/Sql/dbo/Tables/Organization.sql
+++ b/src/Sql/dbo/Tables/Organization.sql
@@ -6,7 +6,7 @@
     [Plan]                 NVARCHAR (20)    NOT NULL,
     [PlanType]             TINYINT          NOT NULL,
     [Seats]                SMALLINT         NULL,
-    [MaxCollections]         SMALLINT         NULL,
+    [MaxCollections]       SMALLINT         NULL,
     [StripeCustomerId]     VARCHAR (50)     NULL,
     [StripeSubscriptionId] VARCHAR (50)     NULL,
     [Enabled]              BIT              NOT NULL,
diff --git a/src/Sql/dbo/Tables/OrganizationUser.sql b/src/Sql/dbo/Tables/OrganizationUser.sql
index ee26e4616b..f8ea015e32 100644
--- a/src/Sql/dbo/Tables/OrganizationUser.sql
+++ b/src/Sql/dbo/Tables/OrganizationUser.sql
@@ -1,14 +1,14 @@
 CREATE TABLE [dbo].[OrganizationUser] (
-    [Id]                 UNIQUEIDENTIFIER NOT NULL,
-    [OrganizationId]     UNIQUEIDENTIFIER NOT NULL,
-    [UserId]             UNIQUEIDENTIFIER NULL,
-    [Email]              NVARCHAR (50)    NULL,
-    [Key]                VARCHAR (MAX)    NULL,
-    [Status]             TINYINT          NOT NULL,
-    [Type]               TINYINT          NOT NULL,
+    [Id]                   UNIQUEIDENTIFIER NOT NULL,
+    [OrganizationId]       UNIQUEIDENTIFIER NOT NULL,
+    [UserId]               UNIQUEIDENTIFIER NULL,
+    [Email]                NVARCHAR (50)    NULL,
+    [Key]                  VARCHAR (MAX)    NULL,
+    [Status]               TINYINT          NOT NULL,
+    [Type]                 TINYINT          NOT NULL,
     [AccessAllCollections] BIT              NOT NULL,
-    [CreationDate]       DATETIME2 (7)    NOT NULL,
-    [RevisionDate]       DATETIME2 (7)    NOT NULL,
+    [CreationDate]         DATETIME2 (7)    NOT NULL,
+    [RevisionDate]         DATETIME2 (7)    NOT NULL,
     CONSTRAINT [PK_OrganizationUser] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_OrganizationUser_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE,
     CONSTRAINT [FK_OrganizationUser_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
diff --git a/src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql b/src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql
similarity index 79%
rename from src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql
rename to src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql
index c9f2f35443..95fcc1b4ea 100644
--- a/src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql
+++ b/src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql
@@ -9,4 +9,4 @@ SELECT
 FROM
     [dbo].[CollectionUser] SU
 INNER JOIN
-    [dbo].[Collection] S ON S.[Id] = SU.[CollectionId]
+    [dbo].[Collection] S ON S.[Id] = SU.[CollectionId]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/SubvaultUserUserDetailsView.sql b/src/Sql/dbo/Views/CollectionUserUserDetailsView.sql
similarity index 100%
rename from src/Sql/dbo/Views/SubvaultUserUserDetailsView.sql
rename to src/Sql/dbo/Views/CollectionUserUserDetailsView.sql
diff --git a/src/Sql/dbo/Views/SubvaultUserView.sql b/src/Sql/dbo/Views/CollectionUserView.sql
similarity index 70%
rename from src/Sql/dbo/Views/SubvaultUserView.sql
rename to src/Sql/dbo/Views/CollectionUserView.sql
index 860f4236eb..3e81be94e9 100644
--- a/src/Sql/dbo/Views/SubvaultUserView.sql
+++ b/src/Sql/dbo/Views/CollectionUserView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[CollectionUser]
+    [dbo].[CollectionUser]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/SubvaultView.sql b/src/Sql/dbo/Views/CollectionView.sql
similarity index 71%
rename from src/Sql/dbo/Views/SubvaultView.sql
rename to src/Sql/dbo/Views/CollectionView.sql
index d1094c8dfd..9fcc5a4a97 100644
--- a/src/Sql/dbo/Views/SubvaultView.sql
+++ b/src/Sql/dbo/Views/CollectionView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[Collection]
+    [dbo].[Collection]
\ No newline at end of file
diff --git a/src/Sql/dbo/Views/GrantView.sql b/src/Sql/dbo/Views/GrantView.sql
index cb9f964b8b..d7772345b4 100644
--- a/src/Sql/dbo/Views/GrantView.sql
+++ b/src/Sql/dbo/Views/GrantView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[Grant]
\ No newline at end of file
+    [dbo].[Grant]
diff --git a/src/Sql/dbo/Views/UserView.sql b/src/Sql/dbo/Views/UserView.sql
index c8b77385a9..82fa8a2c63 100644
--- a/src/Sql/dbo/Views/UserView.sql
+++ b/src/Sql/dbo/Views/UserView.sql
@@ -3,4 +3,4 @@ AS
 SELECT
     *
 FROM
-    [dbo].[User]
\ No newline at end of file
+    [dbo].[User]