diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index 17578ddc07..8be962ee6e 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -86,6 +86,6 @@
     <Build Include="dbo\Stored Procedures\Folder_Create.sql" />
     <Build Include="dbo\Stored Procedures\Site_Update.sql" />
     <Build Include="dbo\Stored Procedures\Folder_Update.sql" />
-    <Build Include="dbo\Stored Procedures\FolderAndSite_ReadByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Cipher_ReadByUserId.sql" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/FolderAndSite_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql
similarity index 80%
rename from src/Sql/dbo/Stored Procedures/FolderAndSite_ReadByUserId.sql
rename to src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql
index c201ee1de8..d6f16b40b7 100644
--- a/src/Sql/dbo/Stored Procedures/FolderAndSite_ReadByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_ReadByUserId.sql	
@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[FolderAndSite_ReadByUserId]
+CREATE PROCEDURE [dbo].[Cipher_ReadByUserId]
     @UserId UNIQUEIDENTIFIER
 AS
 BEGIN
diff --git a/src/Sql/dbo/Stored Procedures/Folder_Update.sql b/src/Sql/dbo/Stored Procedures/Folder_Update.sql
index aadcc31f15..4415a93187 100644
--- a/src/Sql/dbo/Stored Procedures/Folder_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Folder_Update.sql	
@@ -6,7 +6,8 @@
     @RevisionDate DATETIME2(7)
 AS
 BEGIN
-    UPDATE [dbo].[Folder]
+    UPDATE
+        [dbo].[Folder]
     SET
         [UserId] = @UserId,
         [Name] = @Name,
diff --git a/src/Sql/dbo/Stored Procedures/Site_Update.sql b/src/Sql/dbo/Stored Procedures/Site_Update.sql
index e6ab31c179..fb9786713b 100644
--- a/src/Sql/dbo/Stored Procedures/Site_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/Site_Update.sql	
@@ -11,7 +11,8 @@
     @RevisionDate DATETIME2(7)
 AS
 BEGIN
-    UPDATE [dbo].[Site]
+    UPDATE
+        [dbo].[Site]
     SET
         [UserId] = @UserId,
         [FolderId] = @FolderId,
diff --git a/src/Sql/dbo/Stored Procedures/User_Update.sql b/src/Sql/dbo/Stored Procedures/User_Update.sql
index fee898e748..99b45d3352 100644
--- a/src/Sql/dbo/Stored Procedures/User_Update.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_Update.sql	
@@ -12,7 +12,8 @@
     @CreationDate DATETIME2(7)
 AS
 BEGIN
-    UPDATE [dbo].[User]
+    UPDATE
+        [dbo].[User]
     SET
         [Name] = @Name,
         [Email] = @Email,