diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 880ca1bb7d..9a99f5ee33 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_localID = localID;
             m_itemID = itemID;
 
-            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
+            if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
                 m_CMFunctionsEnabled = true;
 
             m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
@@ -116,11 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Get the current Windlight scene
         /// </summary>
         /// <returns>List of windlight parameters</returns>
-        public LSL_List cmGetWindlightScene(LSL_List rules)
+        public LSL_List lsGetWindlightScene(LSL_List rules)
         {
             if (!m_CMFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                CMShoutError("LightShare functions are not enabled.");
                 return new LSL_List();
             }
             m_host.AddScriptLPS(1);
@@ -440,16 +440,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightScene(LSL_List rules)
+        public int lsSetWindlightScene(LSL_List rules)
         {
             if (!m_CMFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                CMShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightScene can only be used by estate managers or owners.");
+                CMShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
@@ -472,16 +472,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         /// <param name="rules"></param>
         /// <returns>success: true or false</returns>
-        public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
+        public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
         {
             if (!m_CMFunctionsEnabled)
             {
-                CMShoutError("Careminster functions are not enabled.");
+                CMShoutError("LightShare functions are not enabled.");
                 return 0;
             }
             if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
             {
-                CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners.");
+                CMShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
                 return 0;
             }
             int success = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
index f13b6e50e3..f47ae7d485 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
     public interface ICM_Api
     {
         // Windlight Functions
-        LSL_List cmGetWindlightScene(LSL_List rules);
-        int cmSetWindlightScene(LSL_List rules);
-        int cmSetWindlightSceneTargeted(LSL_List rules, key target);
+        LSL_List lsGetWindlightScene(LSL_List rules);
+        int lsSetWindlightScene(LSL_List rules);
+        int lsSetWindlightSceneTargeted(LSL_List rules, key target);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
index c0edaae6bc..92c3d982d2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -58,19 +58,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_CM_Functions = (ICM_Api)api;
         }
 
+        public LSL_List lsGetWindlightScene(LSL_List rules)
+        {
+            return m_CM_Functions.lsGetWindlightScene(rules);
+        }
+
+        public int lsSetWindlightScene(LSL_List rules)
+        {
+            return m_CM_Functions.lsSetWindlightScene(rules);
+        }
+
+        public int lsSetWindlightSceneTargeted(LSL_List rules, key target)
+        {
+            return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target);
+        }
+
         public LSL_List cmGetWindlightScene(LSL_List rules)
         {
-            return m_CM_Functions.cmGetWindlightScene(rules);
+            return m_CM_Functions.lsGetWindlightScene(rules);
         }
 
         public int cmSetWindlightScene(LSL_List rules)
         {
-            return m_CM_Functions.cmSetWindlightScene(rules);
+            return m_CM_Functions.lsSetWindlightScene(rules);
         }
 
         public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
         {
-            return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target);
+            return m_CM_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
     }
 }