diff --git a/OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs
rename to OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
similarity index 100%
rename from OpenSim/Services/UserService/UserService.cs
rename to OpenSim/Services/UserAccountService/UserAccountService.cs
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
similarity index 100%
rename from OpenSim/Services/UserService/UserServiceBase.cs
rename to OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3eb68a06d7..e881e30d67 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -34,4 +34,4 @@
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [UserAccountService]
-    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 4efc3018e7..c3ed754823 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -59,4 +59,4 @@
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [UserAccountService]
-    LocalServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/prebuild.xml b/prebuild.xml
index 7881cd7ebf..863064a14b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1038,7 +1038,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserService" path="OpenSim/Services/UserService" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>