diff --git a/api/tacticalrmm/scripts/community_scripts.json b/api/tacticalrmm/scripts/community_scripts.json
index d23325ab..24d89eb6 100644
--- a/api/tacticalrmm/scripts/community_scripts.json
+++ b/api/tacticalrmm/scripts/community_scripts.json
@@ -50,7 +50,7 @@
   },
   {
     "guid": "81cc5bcb-01bf-4b0c-89b9-0ac0f3fe0c04",
-    "filename": "Win_Reset_Windows_Update.ps1",
+    "filename": "Win_Windows_Update_Reset.ps1",
     "submittedBy": "https://github.com/Omnicef",
     "name": "Windows Update - Reset",
     "description": "This script will reset all of the Windows Updates components to DEFAULT SETTINGS.",
@@ -100,7 +100,7 @@
     "guid": "9d34f482-1f0c-4b2f-b65f-a9cf3c13ef5f",
     "filename": "Win_TRMM_Rename_Installed_App.ps1",
     "submittedBy": "https://github.com/bradhawkins85",
-    "name": "TacticalRMM Agent Rename",
+    "name": "TacticalRMM - Agent Rename",
     "description": "Updates the DisplayName registry entry for the Tactical RMM windows agent to your desired name. This script takes 1 required argument: the name you wish to set.",
     "shell": "powershell",
     "category": "TRMM (Win):TacticalRMM Related"
@@ -317,7 +317,7 @@
   },
   {
     "guid": "a821975c-60df-4d58-8990-6cf8a55b4ee0",
-    "filename": "Win_Sync_Time.bat",
+    "filename": "Win_Time_Sync.bat",
     "submittedBy": "https://github.com/dinger1986",
     "name": "ADDC - Sync DC Time",
     "description": "Syncs time with domain controller",
@@ -478,7 +478,7 @@
     "guid": "08ca81f2-f044-4dfc-ad47-090b19b19d76",
     "filename": "Win_User_Logged_in_with_Temp_Profile.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "User Logged in with temp profile check",
+    "name": "User Check - See if user logged in with temp profile",
     "description": "Check if users are logged in with a temp profile",
     "shell": "powershell",
     "category": "TRMM (Win):Other"
@@ -573,7 +573,7 @@
     "guid": "7c0c7e37-60ff-462f-9c34-b5cd4c4796a7",
     "filename": "Win_Wifi_SSID_and_Password_Retrieval.ps1",
     "submittedBy": "https://github.com/silversword411",
-    "name": "Network Wireless - Retrieve Saved passwords",
+    "name": "Network Wireless - Retrieve Saved WiFi passwords",
     "description": "Returns all saved wifi passwords stored on the computer",
     "shell": "powershell",
     "category": "TRMM (Win):Network",
@@ -624,7 +624,7 @@
     "filename": "Win_Network_TCP_Reset_Stack.bat",
     "submittedBy": "https://github.com/silversword411",
     "name": "Network - Reset tcp using netsh",
-    "description": "resets tcp stack using netsh",
+    "description": "Resets TCP stack using netsh",
     "shell": "cmd",
     "category": "TRMM (Win):Network",
     "default_timeout": "120"
@@ -633,7 +633,7 @@
     "guid": "6ce5682a-49db-4c0b-9417-609cf905ac43",
     "filename": "Win_Win10_Change_Key_and_Activate.ps1",
     "submittedBy": "https://github.com/silversword411",
-    "name": "Product Key in Win10 Change and Activate",
+    "name": "Product Key in Win10 - Change and Activate",
     "description": "Insert new product key and Activate. Requires 1 parameter the product key you want to use",
     "shell": "powershell",
     "category": "TRMM (Win):Other",
@@ -653,7 +653,7 @@
     "guid": "83f6c6ea-6120-4fd3-bec8-d3abc505dcdf",
     "filename": "Win_TRMM_Start_Menu_Delete_Shortcut.ps1",
     "submittedBy": "https://github.com/silversword411",
-    "name": "TacticalRMM Delete Start Menu Shortcut for App",
+    "name": "TacticalRMM - Delete Start Menu Shortcut for App",
     "description": "Delete its application shortcut that's installed in the start menu by default",
     "shell": "powershell",
     "category": "TRMM (Win):TacticalRMM Related",
@@ -735,19 +735,19 @@
     "guid": "6a52f495-d43e-40f4-91a9-bbe4f578e6d1",
     "filename": "Win_User_Create.ps1",
     "submittedBy": "https://github.com/brodur",
-    "name": "Create Local User",
+    "name": "User - Create Local",
     "description": "Create a local user. Parameters are: username, password and optional: description, fullname, group (adds to Users if not specified)",
     "shell": "powershell",
-    "category": "TRMM (Win):Other"
+    "category": "TRMM (Win):User Management"
   },
   {
     "guid": "57997ec7-b293-4fd5-9f90-a25426d0eb90",
     "filename": "Win_Users_List.ps1",
     "submittedBy": "https://github.com/tremor021",
-    "name": "Get Computer Users",
+    "name": "Users - List Local Users and Enabled/Disabled Status",
     "description": "Get list of computer users and show which one is enabled",
     "shell": "powershell",
-    "category": "TRMM (Win):Other"
+    "category": "TRMM (Win):User Management"
   },
   {
     "guid": "77da9c87-5a7a-4ba1-bdde-3eeb3b01d62d",
diff --git a/scripts/Win_Sync_Time.bat b/scripts/Win_Time_Sync.bat
similarity index 97%
rename from scripts/Win_Sync_Time.bat
rename to scripts/Win_Time_Sync.bat
index 05388da2..99a9e9bd 100644
--- a/scripts/Win_Sync_Time.bat
+++ b/scripts/Win_Time_Sync.bat
@@ -1,2 +1,2 @@
-REM Syncs time with domain controller
-net time %logonserver% /set /y
+REM Syncs time with domain controller
+net time %logonserver% /set /y
diff --git a/scripts/Win_Reset_Windows_Update.ps1 b/scripts/Win_Windows_Update_Reset.ps1
similarity index 100%
rename from scripts/Win_Reset_Windows_Update.ps1
rename to scripts/Win_Windows_Update_Reset.ps1