diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
rename to OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs
rename to OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
rename to OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
rename to OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
rename to OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
rename to OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
rename to OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs
rename to OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
rename to OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
rename to OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Land/LandServiceConnector.cs
rename to OpenSim/Services/Connectors/Land/LandServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
rename to OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
rename to OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
rename to OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
similarity index 100%
rename from OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
rename to OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs