Rename prefix from Cura_ to LMI_

44 files changed, 1537 insertions, 1487 deletions

diff --git a/cmake/modules/CuraMacros.cmake b/cmake/modules/CuraMacros.cmake
index 25fd0b3..f4b40c3 100644
--- a/cmake/modules/CuraMacros.cmake
+++ b/cmake/modules/CuraMacros.cmake
@@ -86,12 +86,12 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF)
     # Create registration out of shared library
     add_custom_command(TARGET ${LIBRARY_NAME}
                        POST_BUILD
-                       COMMAND ${KONKRETCMPI_KONKRETREG} lib${LIBRARY_NAME}.so > Cura_${PROVIDER_NAME}.reg
+                       COMMAND ${KONKRETCMPI_KONKRETREG} lib${LIBRARY_NAME}.so > LMI_${PROVIDER_NAME}.reg
                        COMMENT "Generating .reg file from library for ${PROVIDER_NAME}"
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
     # Install it
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cura_${PROVIDER_NAME}.reg DESTINATION share/cura-providers/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg DESTINATION share/cura-providers/)
 
     # Add custom target for registration
     find_file(MOF_FILE
@@ -99,5 +99,5 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF)
               PATHS ${CMAKE_SOURCE_DIR}/mof/
     )
     add_custom_target(register-${PROVIDER_NAME}
-                      ${CMAKE_SOURCE_DIR}/register.sh ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/Cura_${PROVIDER_NAME}.reg)
+                      ${CMAKE_SOURCE_DIR}/register.sh ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg)
 endmacro(cim_registration)
diff --git a/examples/test_account.py b/examples/test_account.py
index 5b88ca3..835e3d3 100755
--- a/examples/test_account.py
+++ b/examples/test_account.py
@@ -33,37 +33,37 @@ if len(sys.argv) > 5:
 cliconn = pywbem.WBEMConnection(url, (username, password))
 
 if command == "list_user":
-# Listintg users is simple, just query all instances from Cura_Account
+# Listintg users is simple, just query all instances from LMI_Account
 # or select only by given Name
   if parameter == "*":
-    instances =  cliconn.ExecQuery('WQL', 'select * from Cura_Account')
+    instances =  cliconn.ExecQuery('WQL', 'select * from LMI_Account')
   else:
-    instances = cliconn.ExecQuery('WQL', 'select * from Cura_Account where Name = "%s"' % parameter)
+    instances = cliconn.ExecQuery('WQL', 'select * from LMI_Account where Name = "%s"' % parameter)
   for instance in instances:
     print instance.tomof()
 
 elif command == "list_group":
-# Listintg gruops is simple, just query all instances from Cura_Group
+# Listintg gruops is simple, just query all instances from LMI_Group
 # or select only by given Name
   if parameter == "*":
-    instances = cliconn.ExecQuery('WQL', 'select * from Cura_Group')
+    instances = cliconn.ExecQuery('WQL', 'select * from LMI_Group')
   else:
-    instances = cliconn.ExecQuery('WQL', 'select * from Cura_Group where Name = "%s"' % parameter)
+    instances = cliconn.ExecQuery('WQL', 'select * from LMI_Group where Name = "%s"' % parameter)
   for instance in instances:
     print instance.tomof()
 
 elif command == "group_members":
-# Group members is a bit tricky. You need to select group (Cura_Group)
-# by given Name, then you need to select identities (Cura_Identity), which
-# are connected through Cura_MemberOfGroup to Cura_Group.
-# And finally select all accounts (Cura_Account) which are connected through
-# Cura_AssignedAccountIdentity with selected identities (this should be
+# Group members is a bit tricky. You need to select group (LMI_Group)
+# by given Name, then you need to select identities (LMI_Identity), which
+# are connected through LMI_MemberOfGroup to LMI_Group.
+# And finally select all accounts (LMI_Account) which are connected through
+# LMI_AssignedAccountIdentity with selected identities (this should be
 # 1 to 1)
-  groups = cliconn.ExecQuery('WQL', 'select * from Cura_Group where Name = "%s"' % parameter)
+  groups = cliconn.ExecQuery('WQL', 'select * from LMI_Group where Name = "%s"' % parameter)
   for group in groups:
-    identities = cliconn.Associators(group.path, AssocClass='Cura_MemberOfGroup')
+    identities = cliconn.Associators(group.path, AssocClass='LMI_MemberOfGroup')
     for identity in identities:
-        accounts = cliconn.Associators(identity.path, AssocClass='Cura_AssignedAccountIdentity')
+        accounts = cliconn.Associators(identity.path, AssocClass='LMI_AssignedAccountIdentity')
         for account in accounts:
           print account.tomof()
 
diff --git a/examples/test_power.py b/examples/test_power.py
index e4d6abc..93a0bcd 100755
--- a/examples/test_power.py
+++ b/examples/test_power.py
@@ -44,7 +44,7 @@ if len(computerSystems) > 1:
     print >>sys.stderr, "More than one Linux_ComputerSystem instance found, don't know which to use."
     sys.exit(3)
 
-print cliconn.InvokeMethod("RequestPowerStateChange", "Cura_PowerManagementService",
+print cliconn.InvokeMethod("RequestPowerStateChange", "LMI_PowerManagementService",
                      ManagedElement=computerSystems[0].path,
                      TimeoutPeriod=pywbem.datetime.now(),
                      PowerState=pywbem.Uint16(state),
diff --git a/examples/test_service.py b/examples/test_service.py
new file mode 100755
index 0000000..1883a37
--- /dev/null
+++ b/examples/test_service.py
@@ -0,0 +1,60 @@
+#!/usr/bin/python
+
+import sys
+import pywbem
+
+commands = {
+    'start': 'StartService',
+    'stop': 'StopService',
+    'reload': 'ReloadService',
+    'restart': 'RestartService',
+    'try-restart': 'TryRestartService',
+    'condrestart': 'CondRestartService',
+    'reload-or-restart': 'ReloadOrRestartService',
+    'reload-or-try-restart': 'ReloadOrTryRestartService',
+    'enable': 'TurnServiceOn',
+    'disable': 'TurnServiceOff'
+}
+
+def sanitize(text):
+    return text.replace('"', '').replace("'", "")
+
+if len(sys.argv) < 5:
+    print """Usage: %s <address> <service> <operation> [username] [password]
+    Connect to CIM server at address and execute an operation on the service.
+
+Available states:
+    %s
+
+Example: %s https://127.0.0.1:5989 bluetooth start root redhat""" % (sys.argv[0], "\n    ".join(commands.keys()), sys.argv[0])
+    sys.exit(1)
+
+url = sys.argv[1]
+service = sanitize(sys.argv[2])
+operation = sanitize(sys.argv[3])
+
+username = None
+password = None
+if len(sys.argv) > 4:
+    username = sys.argv[4]
+if len(sys.argv) > 5:
+    password = sys.argv[5]
+
+cliconn = pywbem.WBEMConnection(url, (username, password))
+cliconn.debug = True
+
+services = cliconn.ExecQuery("WQL", "select * from LMI_Service where Name='%s'" % service)
+
+if len(services) == 0:
+    print >>sys.stderr, "Service %s doesn't exist" % service 
+    sys.exit(2)
+
+if len(services) > 1:
+    print >>sys.stderr, "There are more services with name '%s', don't know which one use" % service
+    sys.exit(3)
+
+if operation not in commands.keys():
+    print >>sys.stderr, "Invalid operation '%s'" % operation
+    sys.exit(4)
+
+print cliconn.InvokeMethod(commands[operation], services[0].path)
diff --git a/mof/Cura_Account.mof b/mof/LMI_Account.mof
index eb5256d..ba68aff 100644
--- a/mof/Cura_Account.mof
+++ b/mof/LMI_Account.mof
@@ -1,5 +1,5 @@
 //
-// Cura_Account.mof
+// LMI_Account.mof
 //
 // Copyright (C) 2012  Red Hat, Inc.  All rights reserved.
 //
@@ -22,7 +22,7 @@
 [ Description("Class representing Linux Account"),
   Provider("cmpi:Account")
 ]
-class Cura_Account : CIM_Account
+class LMI_Account : CIM_Account
 {
   [Description("User's home directory")]
   string HomeDirectory;
@@ -40,21 +40,21 @@ class Cura_Account : CIM_Account
   datetime PasswordMaxLifetime;
 };
 
-[ Description("Cura_AccountManagementService creates, manages, and if necessary destroys Linux Accounts on behalf of other SecuritySerices."),
+[ Description("LMI_AccountManagementService creates, manages, and if necessary destroys Linux Accounts on behalf of other SecuritySerices."),
   Provider("cmpi:Account")
 ]
-class Cura_AccountManagementService : CIM_AccountManagementService
+class LMI_AccountManagementService : CIM_AccountManagementService
 {
 };
 
 [ Provider("cmpi:Account") ]
-class Cura_AccountManagementCapabilities : CIM_AccountManagementCapabilities
+class LMI_AccountManagementCapabilities : CIM_AccountManagementCapabilities
 {
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AccountOnSystem : CIM_AccountOnSystem
+class LMI_AccountOnSystem : CIM_AccountOnSystem
 {
   [ Override ("GroupComponent"),
     Min ( 1 ),
@@ -64,98 +64,98 @@ class Cura_AccountOnSystem : CIM_AccountOnSystem
 
   [ Override ("PartComponent"),
     Description ( "The managed Account on the System" )]
-  Cura_Account REF PartComponent;
+  LMI_Account REF PartComponent;
 };
 
 [ Provider("cmpi:Account") ]
-class Cura_AccountSettingData : CIM_AccountSettingData
+class LMI_AccountSettingData : CIM_AccountSettingData
 {
 };
 
 [ Provider("cmpi:Account") ]
-class Cura_Identity : CIM_Identity
+class LMI_Identity : CIM_Identity
 {
 };
 
 [ Provider("cmpi:Account") ]
-class Cura_Group : CIM_Group
+class LMI_Group : CIM_Group
 {
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AssignedAccountIdentity : CIM_AssignedIdentity
+class LMI_AssignedAccountIdentity : CIM_AssignedIdentity
 {
   [ Override ("IdentityInfo"),
     Description ( "The managed Identity" ) ]
-  Cura_Identity REF IdentityInfo;
+  LMI_Identity REF IdentityInfo;
 
   [ Override ("ManagedElement"),
     Description ( "The managed Account on the System" ) ]
-  Cura_Account REF ManagedElement;
+  LMI_Account REF ManagedElement;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AssignedGroupIdentity : CIM_AssignedIdentity
+class LMI_AssignedGroupIdentity : CIM_AssignedIdentity
 {
   [ Override ("IdentityInfo"),
     Description ( "The managed Identity" ) ]
-  Cura_Identity REF IdentityInfo;
+  LMI_Identity REF IdentityInfo;
 
   [ Override ("ManagedElement"),
     Description ( "The managed Group on the System" ) ]
-  Cura_Group REF ManagedElement;
+  LMI_Group REF ManagedElement;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AccountManagementServiceCapabilities : CIM_ElementCapabilities
+class LMI_AccountManagementServiceCapabilities : CIM_ElementCapabilities
 {
   [ Override ("ManagedElement"),
     Description ( "The Central Instance of Account Management" ) ]
-  Cura_AccountManagementService REF ManagedElement;
+  LMI_AccountManagementService REF ManagedElement;
 
   [ Override ("Capabilities"),
     Description ( "The supported Capabilities for managing Linux Accounts" ) ]
-  Cura_AccountManagementCapabilities REF Capabilities;
+  LMI_AccountManagementCapabilities REF Capabilities;
 };
 
 [ Provider("cmpi:Account") ]
-class Cura_EnabledAccountCapabilities : CIM_EnabledLogicalElementCapabilities
+class LMI_EnabledAccountCapabilities : CIM_EnabledLogicalElementCapabilities
 {
 };
 
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AccountCapabilities : CIM_ElementCapabilities
+class LMI_AccountCapabilities : CIM_ElementCapabilities
 {
   [ Override ("ManagedElement"),
     Description ( "The managed Account" ) ]
-  Cura_Account REF ManagedElement;
+  LMI_Account REF ManagedElement;
 
   [ Override ("Capabilities"),
     Description ( "The supported Capabilities for changing the state of the Linux Account" ) ]
-  Cura_EnabledAccountCapabilities REF Capabilities;
+  LMI_EnabledAccountCapabilities REF Capabilities;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_AccountManagementServiceSettingData : CIM_ElementSettingData
+class LMI_AccountManagementServiceSettingData : CIM_ElementSettingData
 {
   [ Override ("ManagedElement"),
     Description ( "The Central Instance of Account management" ) ]
-  Cura_AccountManagementService REF ManagedElement;
+  LMI_AccountManagementService REF ManagedElement;
 
   [ Override ("SettingData"),
     Description ( "The default enforced setting for new Accounts" ) ]
-  Cura_AccountSettingData REF SettingData;
+  LMI_AccountSettingData REF SettingData;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_HostedService : CIM_HostedService
+class LMI_HostedService : CIM_HostedService
 {
   [ Override ("Antecedent"),
     Description ( "The hosting System" ) ]
@@ -163,25 +163,25 @@ class Cura_HostedService : CIM_HostedService
 
   [ Override ("Dependent"),
     Description ( "The Central Instance of Account management" ) ]
-  Cura_AccountManagementService REF Dependent;
+  LMI_AccountManagementService REF Dependent;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_MemberOfGroup : CIM_MemberOfCollection
+class LMI_MemberOfGroup : CIM_MemberOfCollection
 {
   [ Override ("Collection"),
     Description ( "The managed Group on the System" ) ]
-  Cura_Group REF Collection;
+  LMI_Group REF Collection;
 
   [ Override ("Member"),
     Description ( "The managed Identity" ) ]
-  Cura_Identity REF Member;
+  LMI_Identity REF Member;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_OwningGroup : CIM_OwningCollectionElement
+class LMI_OwningGroup : CIM_OwningCollectionElement
 {
   [ Override ("OwningElement"),
     Description ( "The hosting System" ) ]
@@ -189,45 +189,45 @@ class Cura_OwningGroup : CIM_OwningCollectionElement
 
   [ Override ("OwnedElement"),
     Description ( "The managed Group on the System" ) ]
-  Cura_Group REF OwnedElement;
+  LMI_Group REF OwnedElement;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_ServiceAffectsIdentity : CIM_ServiceAffectsElement
+class LMI_ServiceAffectsIdentity : CIM_ServiceAffectsElement
 {
   [ Override ("AffectingElement"),
     Description ( "The Central Instance of Account management" ) ]
-  Cura_AccountManagementService REF AffectingElement;
+  LMI_AccountManagementService REF AffectingElement;
 
   [ Override ("AffectedElement"),
     Description ( "The managed Identity" ) ]
-  Cura_Identity REF AffectedElement;
+  LMI_Identity REF AffectedElement;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_SettingsDefineManagementCapabilities : CIM_SettingsDefineCapabilities
+class LMI_SettingsDefineManagementCapabilities : CIM_SettingsDefineCapabilities
 {
   [ Override ("GroupComponent"),
     Description ( "The Account Management Capabilities" ) ]
-  Cura_AccountManagementCapabilities REF GroupComponent;
+  LMI_AccountManagementCapabilities REF GroupComponent;
 
   [ Override ("PartComponent"),
     Description ( "The default enforced setting for new Accounts" ) ]
-  Cura_AccountSettingData REF PartComponent;
+  LMI_AccountSettingData REF PartComponent;
 };
 
 [ Association,
   Provider("cmpi:Account") ]
-class Cura_SettingsDefineAccountCapabilities : CIM_SettingsDefineCapabilities
+class LMI_SettingsDefineAccountCapabilities : CIM_SettingsDefineCapabilities
 {
   [ Override ("GroupComponent"),
     Description ( "The Account Capabilities" ) ]
-  Cura_EnabledAccountCapabilities REF GroupComponent;
+  LMI_EnabledAccountCapabilities REF GroupComponent;
 
   [ Override ("PartComponent"),
     Description ( "The default enforced setting for new Accounts" ) ]
-  Cura_AccountSettingData REF PartComponent;
+  LMI_AccountSettingData REF PartComponent;
 };
 
diff --git a/mof/Cura_Fan.mof b/mof/LMI_Fan.mof
index e3582ad..caee936 100644
--- a/mof/Cura_Fan.mof
+++ b/mof/LMI_Fan.mof
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-[ Provider("cmpi:cmpiCura_FanProvider") ]
-class Cura_Fan: CIM_Fan
+[ Provider("cmpi:cmpiCura_Fan") ]
+class LMI_Fan: CIM_Fan
 {
     [ Key, Override("DeviceID"),
       Description("Uniquely identifies fan. It is a composition of "
@@ -81,8 +81,8 @@ class Cura_Fan: CIM_Fan
     boolean MaxAlarm;
 };
 
-[ Provider("cmpi:cmpiCura_FanSensorProvider") ]
-class Cura_FanSensor: CIM_NumericSensor
+[ Provider("cmpi:cmpiCura_Fan") ]
+class LMI_FanSensor: CIM_NumericSensor
 {
     [ Key, Override("DeviceID"),
       Description("Uniquely identifies fan. It is a composition of "
@@ -95,12 +95,12 @@ class Cura_FanSensor: CIM_NumericSensor
 };
 
 [ Association,
-  Provider("cmpi:cmpiCura_FanAssociatedSensorProvider") ]
-class Cura_FanAssociatedSensor: CIM_AssociatedSensor
+  Provider("cmpi:cmpiCura_Fan") ]
+class LMI_FanAssociatedSensor: CIM_AssociatedSensor
 {
     [ Override("Antecedent") ]
-    Cura_FanSensor REF Antecedent;
+    LMI_FanSensor REF Antecedent;
 
     [ Override("Dependent") ]
-    Cura_Fan REF Dependent;
+    LMI_Fan REF Dependent;
 };
diff --git a/mof/Cura_PowerManagement.mof b/mof/LMI_PowerManagement.mof
index d0fe5cb..b7a3cba 100644
--- a/mof/Cura_PowerManagement.mof
+++ b/mof/LMI_PowerManagement.mof
@@ -16,17 +16,17 @@
  */
 
 [ Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_PowerManagementService: CIM_PowerManagementService
+class LMI_PowerManagementService: CIM_PowerManagementService
 {
 };
 
 [ Association,
   Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_AssociatedPowerManagementService: CIM_AssociatedPowerManagementService
+class LMI_AssociatedPowerManagementService: CIM_AssociatedPowerManagementService
 {
     [ Override("ServiceProvided"), Max(1),
       Description("The Service that is available.") ]
-    Cura_PowerManagementService REF ServiceProvided;
+    LMI_PowerManagementService REF ServiceProvided;
 
     [ Override("UserOfService"),
       Description("The ManagedElement that can use the Service.") ]
@@ -34,13 +34,13 @@ class Cura_AssociatedPowerManagementService: CIM_AssociatedPowerManagementServic
 };
 
 [ Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_PowerManagementCapabilities: CIM_PowerManagementCapabilities
+class LMI_PowerManagementCapabilities: CIM_PowerManagementCapabilities
 {
 };
 
 [ Association,
   Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_HostedService: CIM_HostedService
+class LMI_HostedPowerManagementService: CIM_HostedService
 {
     [ Override("Antecedent"), Min(1), Max(1),
       Description("The hosting System.") ]
@@ -48,21 +48,21 @@ class Cura_HostedService: CIM_HostedService
 
     [ Override("Dependent"), Weak,
       Description("The Service hosted on the System.") ]
-    Cura_PowerManagementService REF Dependent;
+    LMI_PowerManagementService REF Dependent;
 };
 
 [ Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_ConcreteJob: CIM_ConcreteJob
+class LMI_ConcreteJob: CIM_ConcreteJob
 {
 };
 
 [ Provider("cmpi:cmpiCura_PowerManagement") ]
-class Cura_ElementCapabilities: CIM_ElementCapabilities
+class LMI_ElementCapabilities: CIM_ElementCapabilities
 {
     [ Key, Min(1), Description("The managed element.") ]
-    Cura_PowerManagementService REF ManagedElement;
+    LMI_PowerManagementService REF ManagedElement;
 
     [ Key,
       Description("The Capabilities object associated with the element.") ]
-    Cura_PowerManagementCapabilities REF Capabilities;
+    LMI_PowerManagementCapabilities REF Capabilities;
 };
diff --git a/mof/Cura_Service.mof b/mof/LMI_Service.mof
index 1cd0c65..86b469f 100644
--- a/mof/Cura_Service.mof
+++ b/mof/LMI_Service.mof
@@ -17,37 +17,27 @@
 
 [ Description("Class representing Linux Service"),
   Provider("cmpi:cmpiCura_Service") ]
-class Cura_Service: CIM_Service
+class LMI_Service: CIM_Service
 {
-    [ Override("StartService"),
-      Provider("cmpi:cmpiCura_Service") ]
+    [ Override("StartService") ]
     uint32 StartService();
 
-    [ Override("StopService"),
-      Provider("cmpi:cmpiCura_Service") ]
+    [ Override("StopService") ]
     uint32 StopService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 ReloadService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 RestartService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 TryRestartService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 CondRestartService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 ReloadOrRestartService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 ReloadOrTryRestartService();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 TurnServiceOn();
 
-    [ Provider("cmpi:cmpiCura_Service") ]
     uint32 TurnServiceOff();
 };
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
index 35fd843..8d69a93 100644
--- a/src/account/CMakeLists.txt
+++ b/src/account/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME Account)
 set(LIBRARY_NAME cmpiCura_${PROVIDER_NAME})
-set(MOF Cura_Account.mof)
+set(MOF LMI_Account.mof)
 
 set(provider_SRCS
     aux_lu.c
diff --git a/src/account/Cura_AccountManagementCapabilitiesProvider.c b/src/account/Cura_AccountManagementCapabilitiesProvider.c
deleted file mode 100644
index 29921ab..0000000
--- a/src/account/Cura_AccountManagementCapabilitiesProvider.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <konkret/konkret.h>
-#include "Cura_AccountManagementCapabilities.h"
-
-#include <stdbool.h>
-
-#include "macros.h"
-#include "globals.h"
-
-#define NAME LAMCNAME
-
-static const CMPIBroker* _cb = NULL;
-
-static void Cura_AccountManagementCapabilitiesInitialize()
-{
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesCleanup(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    CMPIBoolean term)
-{
-    CMReturn(CMPI_RC_OK);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesEnumInstanceNames(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop)
-{
-    return KDefaultEnumerateInstanceNames(
-        _cb, mi, cc, cr, cop);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesEnumInstances(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const char** properties)
-{
-    Cura_AccountManagementCapabilities lamc;
-
-    Cura_AccountManagementCapabilities_Init(&lamc, _cb, KNameSpace(cop));
-    Cura_AccountManagementCapabilities_Set_ElementNameEditSupported(
-      &lamc, false);
-    Cura_AccountManagementCapabilities_Set_InstanceID(&lamc, ORGID":"LAMCNAME);
-    Cura_AccountManagementCapabilities_Set_ElementName(&lamc, NAME);
-
-    Cura_AccountManagementCapabilities_Init_OperationsSupported(&lamc, 3);
-    Cura_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 0,
-      Cura_AccountManagementCapabilities_OperationsSupported_Create);
-    Cura_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 1,
-      Cura_AccountManagementCapabilities_OperationsSupported_Modify);
-    Cura_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 2,
-      Cura_AccountManagementCapabilities_OperationsSupported_Delete);
-
-    Cura_AccountManagementCapabilities_Init_SupportedUserPasswordEncryptionAlgorithms(&lamc, 1);
-    Cura_AccountManagementCapabilities_Set_SupportedUserPasswordEncryptionAlgorithms(&lamc, 0, Cura_AccountManagementCapabilities_SupportedUserPasswordEncryptionAlgorithms_Other);
-
-    KReturnInstance(cr, lamc);
-    CMReturn(CMPI_RC_OK);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesGetInstance(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const char** properties)
-{
-    return KDefaultGetInstance(
-        _cb, mi, cc, cr, cop, properties);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesCreateInstance(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const CMPIInstance* ci)
-{
-    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesModifyInstance(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const CMPIInstance* ci,
-    const char** properties)
-{
-    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesDeleteInstance(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop)
-{
-    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesExecQuery(
-    CMPIInstanceMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const char* lang,
-    const char* query)
-{
-    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
-}
-
-CMInstanceMIStub(
-    Cura_AccountManagementCapabilities,
-    Cura_AccountManagementCapabilities,
-    _cb,
-    Cura_AccountManagementCapabilitiesInitialize())
-
-static CMPIStatus Cura_AccountManagementCapabilitiesMethodCleanup(
-    CMPIMethodMI* mi,
-    const CMPIContext* cc,
-    CMPIBoolean term)
-{
-    CMReturn(CMPI_RC_OK);
-}
-
-static CMPIStatus Cura_AccountManagementCapabilitiesInvokeMethod(
-    CMPIMethodMI* mi,
-    const CMPIContext* cc,
-    const CMPIResult* cr,
-    const CMPIObjectPath* cop,
-    const char* meth,
-    const CMPIArgs* in,
-    CMPIArgs* out)
-{
-    return Cura_AccountManagementCapabilities_DispatchMethod(
-        _cb, mi, cc, cr, cop, meth, in, out);
-}
-
-CMMethodMIStub(
-    Cura_AccountManagementCapabilities,
-    Cura_AccountManagementCapabilities,
-    _cb,
-    Cura_AccountManagementCapabilitiesInitialize())
-
-KONKRET_REGISTRATION(
-    "root/cimv2",
-    "Cura_AccountManagementCapabilities",
-    "Cura_AccountManagementCapabilities",
-    "instance method")
diff --git a/src/account/Cura_AccountCapabilitiesProvider.c b/src/account/LMI_AccountCapabilitiesProvider.c
index b325f4a..323f611 100644
--- a/src/account/Cura_AccountCapabilitiesProvider.c
+++ b/src/account/LMI_AccountCapabilitiesProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountCapabilities.h"
-#include "Cura_Account.h"
-#include "Cura_EnabledAccountCapabilities.h"
+#include "LMI_AccountCapabilities.h"
+#include "LMI_Account.h"
+#include "LMI_EnabledAccountCapabilities.h"
 
 #include "macros.h"
 #include "globals.h"
@@ -14,11 +14,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_AccountCapabilitiesInitialize()
+static void LMI_AccountCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountCapabilitiesCleanup( 
+static CMPIStatus LMI_AccountCapabilitiesCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -26,7 +26,7 @@ static CMPIStatus Cura_AccountCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesEnumInstanceNames( 
+static CMPIStatus LMI_AccountCapabilitiesEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -36,16 +36,16 @@ static CMPIStatus Cura_AccountCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesEnumInstances( 
+static CMPIStatus LMI_AccountCapabilitiesEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_AccountRef laref;
-    Cura_EnabledAccountCapabilitiesRef leacref;
-    Cura_AccountCapabilities lac;
+    LMI_AccountRef laref;
+    LMI_EnabledAccountCapabilitiesRef leacref;
+    LMI_AccountCapabilities lac;
 
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
@@ -56,8 +56,8 @@ static CMPIStatus Cura_AccountCapabilitiesEnumInstances(
     const char *nameSpace = KNameSpace(cop);
     const char *hostname = get_system_name();
 
-    Cura_EnabledAccountCapabilitiesRef_Init(&leacref, _cb, nameSpace);
-    Cura_EnabledAccountCapabilitiesRef_Set_InstanceID(&leacref,
+    LMI_EnabledAccountCapabilitiesRef_Init(&leacref, _cb, nameSpace);
+    LMI_EnabledAccountCapabilitiesRef_Set_InstanceID(&leacref,
       ORGID":"LEACNAME);
 
     luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
@@ -72,17 +72,17 @@ static CMPIStatus Cura_AccountCapabilitiesEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_AccountRef_Init(&laref, _cb, nameSpace);
-        Cura_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
-        Cura_AccountRef_Set_SystemCreationClassName(&laref,
+        LMI_AccountRef_Init(&laref, _cb, nameSpace);
+        LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
+        LMI_AccountRef_Set_SystemCreationClassName(&laref,
           get_system_creation_class_name());
-        Cura_AccountRef_Set_SystemName(&laref, hostname);
-        Cura_AccountRef_Set_CreationClassName(&laref,
-          Cura_Account_ClassName);
+        LMI_AccountRef_Set_SystemName(&laref, hostname);
+        LMI_AccountRef_Set_CreationClassName(&laref,
+          LMI_Account_ClassName);
 
-        Cura_AccountCapabilities_Init(&lac, _cb, nameSpace);
-        Cura_AccountCapabilities_Set_ManagedElement(&lac, &laref);
-        Cura_AccountCapabilities_Set_Capabilities(&lac, &leacref);
+        LMI_AccountCapabilities_Init(&lac, _cb, nameSpace);
+        LMI_AccountCapabilities_Set_ManagedElement(&lac, &laref);
+        LMI_AccountCapabilities_Set_Capabilities(&lac, &leacref);
 
         KReturnInstance(cr, lac);
         lu_ent_free(lue);
@@ -98,7 +98,7 @@ static CMPIStatus Cura_AccountCapabilitiesEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesGetInstance( 
+static CMPIStatus LMI_AccountCapabilitiesGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -109,7 +109,7 @@ static CMPIStatus Cura_AccountCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesCreateInstance( 
+static CMPIStatus LMI_AccountCapabilitiesCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -119,7 +119,7 @@ static CMPIStatus Cura_AccountCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesModifyInstance( 
+static CMPIStatus LMI_AccountCapabilitiesModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -130,7 +130,7 @@ static CMPIStatus Cura_AccountCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesDeleteInstance( 
+static CMPIStatus LMI_AccountCapabilitiesDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -139,7 +139,7 @@ static CMPIStatus Cura_AccountCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesExecQuery(
+static CMPIStatus LMI_AccountCapabilitiesExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -150,7 +150,7 @@ static CMPIStatus Cura_AccountCapabilitiesExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesAssociationCleanup( 
+static CMPIStatus LMI_AccountCapabilitiesAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -158,7 +158,7 @@ static CMPIStatus Cura_AccountCapabilitiesAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesAssociators(
+static CMPIStatus LMI_AccountCapabilitiesAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -175,7 +175,7 @@ static CMPIStatus Cura_AccountCapabilitiesAssociators(
         cc,
         cr,
         cop,
-        Cura_AccountCapabilities_ClassName,
+        LMI_AccountCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
@@ -183,7 +183,7 @@ static CMPIStatus Cura_AccountCapabilitiesAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesAssociatorNames(
+static CMPIStatus LMI_AccountCapabilitiesAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -199,14 +199,14 @@ static CMPIStatus Cura_AccountCapabilitiesAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AccountCapabilities_ClassName,
+        LMI_AccountCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesReferences(
+static CMPIStatus LMI_AccountCapabilitiesReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -221,13 +221,13 @@ static CMPIStatus Cura_AccountCapabilitiesReferences(
         cc,
         cr,
         cop,
-        Cura_AccountCapabilities_ClassName,
+        LMI_AccountCapabilities_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AccountCapabilitiesReferenceNames(
+static CMPIStatus LMI_AccountCapabilitiesReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -241,25 +241,25 @@ static CMPIStatus Cura_AccountCapabilitiesReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AccountCapabilities_ClassName,
+        LMI_AccountCapabilities_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AccountCapabilities,
-    Cura_AccountCapabilities,
+    LMI_AccountCapabilities,
+    LMI_AccountCapabilities,
     _cb,
-    Cura_AccountCapabilitiesInitialize())
+    LMI_AccountCapabilitiesInitialize())
 
 CMAssociationMIStub( 
-    Cura_AccountCapabilities,
-    Cura_AccountCapabilities,
+    LMI_AccountCapabilities,
+    LMI_AccountCapabilities,
     _cb,
-    Cura_AccountCapabilitiesInitialize())
+    LMI_AccountCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountCapabilities",
-    "Cura_AccountCapabilities",
+    "LMI_AccountCapabilities",
+    "LMI_AccountCapabilities",
     "instance association")
diff --git a/src/account/LMI_AccountManagementCapabilitiesProvider.c b/src/account/LMI_AccountManagementCapabilitiesProvider.c
new file mode 100644
index 0000000..e08dd66
--- /dev/null
+++ b/src/account/LMI_AccountManagementCapabilitiesProvider.c
@@ -0,0 +1,154 @@
+#include <konkret/konkret.h>
+#include "LMI_AccountManagementCapabilities.h"
+
+#include <stdbool.h>
+
+#include "macros.h"
+#include "globals.h"
+
+#define NAME LAMCNAME
+
+static const CMPIBroker* _cb = NULL;
+
+static void LMI_AccountManagementCapabilitiesInitialize()
+{
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesCleanup(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    CMPIBoolean term)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesEnumInstanceNames(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop)
+{
+    return KDefaultEnumerateInstanceNames(
+        _cb, mi, cc, cr, cop);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesEnumInstances(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char** properties)
+{
+    LMI_AccountManagementCapabilities lamc;
+
+    LMI_AccountManagementCapabilities_Init(&lamc, _cb, KNameSpace(cop));
+    LMI_AccountManagementCapabilities_Set_ElementNameEditSupported(
+      &lamc, false);
+    LMI_AccountManagementCapabilities_Set_InstanceID(&lamc, ORGID":"LAMCNAME);
+    LMI_AccountManagementCapabilities_Set_ElementName(&lamc, NAME);
+
+    LMI_AccountManagementCapabilities_Init_OperationsSupported(&lamc, 3);
+    LMI_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 0,
+      LMI_AccountManagementCapabilities_OperationsSupported_Create);
+    LMI_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 1,
+      LMI_AccountManagementCapabilities_OperationsSupported_Modify);
+    LMI_AccountManagementCapabilities_Set_OperationsSupported(&lamc, 2,
+      LMI_AccountManagementCapabilities_OperationsSupported_Delete);
+
+    LMI_AccountManagementCapabilities_Init_SupportedUserPasswordEncryptionAlgorithms(&lamc, 1);
+    LMI_AccountManagementCapabilities_Set_SupportedUserPasswordEncryptionAlgorithms(&lamc, 0, LMI_AccountManagementCapabilities_SupportedUserPasswordEncryptionAlgorithms_Other);
+
+    KReturnInstance(cr, lamc);
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesGetInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char** properties)
+{
+    return KDefaultGetInstance(
+        _cb, mi, cc, cr, cop, properties);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesCreateInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const CMPIInstance* ci)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesModifyInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const CMPIInstance* ci,
+    const char** properties)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesDeleteInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesExecQuery(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* lang,
+    const char* query)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+CMInstanceMIStub(
+    LMI_AccountManagementCapabilities,
+    LMI_AccountManagementCapabilities,
+    _cb,
+    LMI_AccountManagementCapabilitiesInitialize())
+
+static CMPIStatus LMI_AccountManagementCapabilitiesMethodCleanup(
+    CMPIMethodMI* mi,
+    const CMPIContext* cc,
+    CMPIBoolean term)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_AccountManagementCapabilitiesInvokeMethod(
+    CMPIMethodMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* meth,
+    const CMPIArgs* in,
+    CMPIArgs* out)
+{
+    return LMI_AccountManagementCapabilities_DispatchMethod(
+        _cb, mi, cc, cr, cop, meth, in, out);
+}
+
+CMMethodMIStub(
+    LMI_AccountManagementCapabilities,
+    LMI_AccountManagementCapabilities,
+    _cb,
+    LMI_AccountManagementCapabilitiesInitialize())
+
+KONKRET_REGISTRATION(
+    "root/cimv2",
+    "LMI_AccountManagementCapabilities",
+    "LMI_AccountManagementCapabilities",
+    "instance method")
diff --git a/src/account/Cura_AccountManagementServiceCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
index 459770f..fb334c1 100644
--- a/src/account/Cura_AccountManagementServiceCapabilitiesProvider.c
+++ b/src/account/LMI_AccountManagementServiceCapabilitiesProvider.c
@@ -1,18 +1,18 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountManagementServiceCapabilities.h"
-#include "Cura_AccountManagementService.h"
-#include "Cura_AccountManagementCapabilities.h"
+#include "LMI_AccountManagementServiceCapabilities.h"
+#include "LMI_AccountManagementService.h"
+#include "LMI_AccountManagementCapabilities.h"
 
 #include "macros.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_AccountManagementServiceCapabilitiesInitialize()
+static void LMI_AccountManagementServiceCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesCleanup( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -20,7 +20,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesEnumInstanceNames( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -30,36 +30,36 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesEnumInstances( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_AccountManagementServiceRef lamsref;
-    Cura_AccountManagementCapabilitiesRef lamcref;
-    Cura_AccountManagementServiceCapabilities lamsc;
+    LMI_AccountManagementServiceRef lamsref;
+    LMI_AccountManagementCapabilitiesRef lamcref;
+    LMI_AccountManagementServiceCapabilities lamsc;
 
     const char *nameSpace = KNameSpace(cop);
     const char *hostname = get_system_name();
 
-    Cura_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
-    Cura_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
-    Cura_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
+    LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
+    LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
+    LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
       get_system_creation_class_name());
-    Cura_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
-    Cura_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
-      Cura_AccountManagementService_ClassName);
+    LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
+    LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
+      LMI_AccountManagementService_ClassName);
 
-    Cura_AccountManagementCapabilitiesRef_Init(&lamcref, _cb, nameSpace);
-    Cura_AccountManagementCapabilitiesRef_Set_InstanceID(&lamcref,
+    LMI_AccountManagementCapabilitiesRef_Init(&lamcref, _cb, nameSpace);
+    LMI_AccountManagementCapabilitiesRef_Set_InstanceID(&lamcref,
       ORGID":"LAMCNAME);
 
-    Cura_AccountManagementServiceCapabilities_Init(&lamsc, _cb, nameSpace);
-    Cura_AccountManagementServiceCapabilities_Set_ManagedElement(&lamsc,
+    LMI_AccountManagementServiceCapabilities_Init(&lamsc, _cb, nameSpace);
+    LMI_AccountManagementServiceCapabilities_Set_ManagedElement(&lamsc,
       &lamsref);
-    Cura_AccountManagementServiceCapabilities_Set_Capabilities(&lamsc,
+    LMI_AccountManagementServiceCapabilities_Set_Capabilities(&lamsc,
       &lamcref);
 
     KReturnInstance(cr, lamsc);
@@ -67,7 +67,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesGetInstance( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -78,7 +78,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesCreateInstance( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -88,7 +88,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesModifyInstance( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -99,7 +99,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesDeleteInstance( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -108,7 +108,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesExecQuery(
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -119,7 +119,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociationCleanup( 
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -127,7 +127,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociators(
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -144,7 +144,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociators(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceCapabilities_ClassName,
+        LMI_AccountManagementServiceCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
@@ -152,7 +152,7 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociatorNames(
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -168,14 +168,14 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceCapabilities_ClassName,
+        LMI_AccountManagementServiceCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesReferences(
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -190,13 +190,13 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesReferences(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceCapabilities_ClassName,
+        LMI_AccountManagementServiceCapabilities_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCapabilitiesReferenceNames(
+static CMPIStatus LMI_AccountManagementServiceCapabilitiesReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -210,25 +210,25 @@ static CMPIStatus Cura_AccountManagementServiceCapabilitiesReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceCapabilities_ClassName,
+        LMI_AccountManagementServiceCapabilities_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AccountManagementServiceCapabilities,
-    Cura_AccountManagementServiceCapabilities,
+    LMI_AccountManagementServiceCapabilities,
+    LMI_AccountManagementServiceCapabilities,
     _cb,
-    Cura_AccountManagementServiceCapabilitiesInitialize())
+    LMI_AccountManagementServiceCapabilitiesInitialize())
 
 CMAssociationMIStub( 
-    Cura_AccountManagementServiceCapabilities,
-    Cura_AccountManagementServiceCapabilities,
+    LMI_AccountManagementServiceCapabilities,
+    LMI_AccountManagementServiceCapabilities,
     _cb,
-    Cura_AccountManagementServiceCapabilitiesInitialize())
+    LMI_AccountManagementServiceCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountManagementServiceCapabilities",
-    "Cura_AccountManagementServiceCapabilities",
+    "LMI_AccountManagementServiceCapabilities",
+    "LMI_AccountManagementServiceCapabilities",
     "instance association")
diff --git a/src/account/Cura_AccountManagementServiceProvider.c b/src/account/LMI_AccountManagementServiceProvider.c
index f50d8f3..b47ab93 100644
--- a/src/account/Cura_AccountManagementServiceProvider.c
+++ b/src/account/LMI_AccountManagementServiceProvider.c
@@ -1,16 +1,16 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountManagementService.h"
+#include "LMI_AccountManagementService.h"
 
 #include "macros.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_AccountManagementServiceInitialize()
+static void LMI_AccountManagementServiceInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountManagementServiceCleanup(
+static CMPIStatus LMI_AccountManagementServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -18,7 +18,7 @@ static CMPIStatus Cura_AccountManagementServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceEnumInstanceNames(
+static CMPIStatus LMI_AccountManagementServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -28,35 +28,35 @@ static CMPIStatus Cura_AccountManagementServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountManagementServiceEnumInstances(
+static CMPIStatus LMI_AccountManagementServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_AccountManagementService lams;
+    LMI_AccountManagementService lams;
 
     const char *hostname = get_system_name();
 
-    Cura_AccountManagementService_Init(&lams, _cb, KNameSpace(cop));
-    Cura_AccountManagementService_Set_CreationClassName(&lams,
-      Cura_AccountManagementService_ClassName);
-    Cura_AccountManagementService_Set_SystemName(&lams, hostname);
-    Cura_AccountManagementService_Set_Name(&lams, LAMSNAME);
-    Cura_AccountManagementService_Set_ElementName(&lams, LAMSNAME);
-    Cura_AccountManagementService_Set_SystemCreationClassName(&lams,
+    LMI_AccountManagementService_Init(&lams, _cb, KNameSpace(cop));
+    LMI_AccountManagementService_Set_CreationClassName(&lams,
+      LMI_AccountManagementService_ClassName);
+    LMI_AccountManagementService_Set_SystemName(&lams, hostname);
+    LMI_AccountManagementService_Set_Name(&lams, LAMSNAME);
+    LMI_AccountManagementService_Set_ElementName(&lams, LAMSNAME);
+    LMI_AccountManagementService_Set_SystemCreationClassName(&lams,
       get_system_creation_class_name());
-    Cura_AccountManagementService_Set_RequestedState(&lams,
-      Cura_AccountManagementService_RequestedState_Not_Applicable);
-    Cura_AccountManagementService_Set_EnabledState(&lams,
-      Cura_AccountManagementService_EnabledState_Enabled);
+    LMI_AccountManagementService_Set_RequestedState(&lams,
+      LMI_AccountManagementService_RequestedState_Not_Applicable);
+    LMI_AccountManagementService_Set_EnabledState(&lams,
+      LMI_AccountManagementService_EnabledState_Enabled);
 
     KReturnInstance(cr, lams);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceGetInstance(
+static CMPIStatus LMI_AccountManagementServiceGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -67,7 +67,7 @@ static CMPIStatus Cura_AccountManagementServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceCreateInstance(
+static CMPIStatus LMI_AccountManagementServiceCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -77,7 +77,7 @@ static CMPIStatus Cura_AccountManagementServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceModifyInstance(
+static CMPIStatus LMI_AccountManagementServiceModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -88,7 +88,7 @@ static CMPIStatus Cura_AccountManagementServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceDeleteInstance(
+static CMPIStatus LMI_AccountManagementServiceDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -97,7 +97,7 @@ static CMPIStatus Cura_AccountManagementServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceExecQuery(
+static CMPIStatus LMI_AccountManagementServiceExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -109,12 +109,12 @@ static CMPIStatus Cura_AccountManagementServiceExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_AccountManagementService,
-    Cura_AccountManagementService,
+    LMI_AccountManagementService,
+    LMI_AccountManagementService,
     _cb,
-    Cura_AccountManagementServiceInitialize())
+    LMI_AccountManagementServiceInitialize())
 
-static CMPIStatus Cura_AccountManagementServiceMethodCleanup(
+static CMPIStatus LMI_AccountManagementServiceMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -122,7 +122,7 @@ static CMPIStatus Cura_AccountManagementServiceMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceInvokeMethod(
+static CMPIStatus LMI_AccountManagementServiceInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -131,21 +131,21 @@ static CMPIStatus Cura_AccountManagementServiceInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_AccountManagementService_DispatchMethod(
+    return LMI_AccountManagementService_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_AccountManagementService,
-    Cura_AccountManagementService,
+    LMI_AccountManagementService,
+    LMI_AccountManagementService,
     _cb,
-    Cura_AccountManagementServiceInitialize())
+    LMI_AccountManagementServiceInitialize())
 
-KUint32 Cura_AccountManagementService_RequestStateChange(
+KUint32 LMI_AccountManagementService_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_AccountManagementServiceRef* self,
+    const LMI_AccountManagementServiceRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -157,11 +157,11 @@ KUint32 Cura_AccountManagementService_RequestStateChange(
     return result;
 }
 
-KUint32 Cura_AccountManagementService_StartService(
+KUint32 LMI_AccountManagementService_StartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_AccountManagementServiceRef* self,
+    const LMI_AccountManagementServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -170,11 +170,11 @@ KUint32 Cura_AccountManagementService_StartService(
     return result;
 }
 
-KUint32 Cura_AccountManagementService_StopService(
+KUint32 LMI_AccountManagementService_StopService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_AccountManagementServiceRef* self,
+    const LMI_AccountManagementServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -183,11 +183,11 @@ KUint32 Cura_AccountManagementService_StopService(
     return result;
 }
 
-KUint32 Cura_AccountManagementService_CreateAccount(
+KUint32 LMI_AccountManagementService_CreateAccount(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_AccountManagementServiceRef* self,
+    const LMI_AccountManagementServiceRef* self,
     const KRef* System,
     const KString* AccountTemplate,
     KRef* Account,
@@ -202,6 +202,6 @@ KUint32 Cura_AccountManagementService_CreateAccount(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountManagementService",
-    "Cura_AccountManagementService",
+    "LMI_AccountManagementService",
+    "LMI_AccountManagementService",
     "instance method")
diff --git a/src/account/Cura_SettingsDefineManagementCapabilitiesProvider.c b/src/account/LMI_AccountManagementServiceSettingDataProvider.c
index bd89874..f541d8e 100644
--- a/src/account/Cura_SettingsDefineManagementCapabilitiesProvider.c
+++ b/src/account/LMI_AccountManagementServiceSettingDataProvider.c
@@ -1,13 +1,13 @@
 #include <konkret/konkret.h>
-#include "Cura_SettingsDefineManagementCapabilities.h"
+#include "LMI_AccountManagementServiceSettingData.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_SettingsDefineManagementCapabilitiesInitialize()
+static void LMI_AccountManagementServiceSettingDataInitialize()
 {
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesCleanup( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -15,7 +15,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesEnumInstanceNames( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -25,7 +25,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesEnumInstances( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -35,7 +35,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesGetInstance( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -46,7 +46,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesCreateInstance( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -56,7 +56,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesModifyInstance( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -67,7 +67,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesDeleteInstance( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -76,7 +76,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesExecQuery(
+static CMPIStatus LMI_AccountManagementServiceSettingDataExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -87,7 +87,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociationCleanup( 
+static CMPIStatus LMI_AccountManagementServiceSettingDataAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -95,7 +95,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociators(
+static CMPIStatus LMI_AccountManagementServiceSettingDataAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -112,7 +112,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociators(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineManagementCapabilities_ClassName,
+        LMI_AccountManagementServiceSettingData_ClassName,
         assocClass,
         resultClass,
         role,
@@ -120,7 +120,7 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociators(
         properties);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociatorNames(
+static CMPIStatus LMI_AccountManagementServiceSettingDataAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -136,14 +136,14 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineManagementCapabilities_ClassName,
+        LMI_AccountManagementServiceSettingData_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesReferences(
+static CMPIStatus LMI_AccountManagementServiceSettingDataReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -158,13 +158,13 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesReferences(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineManagementCapabilities_ClassName,
+        LMI_AccountManagementServiceSettingData_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_SettingsDefineManagementCapabilitiesReferenceNames(
+static CMPIStatus LMI_AccountManagementServiceSettingDataReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,25 +178,25 @@ static CMPIStatus Cura_SettingsDefineManagementCapabilitiesReferenceNames(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineManagementCapabilities_ClassName,
+        LMI_AccountManagementServiceSettingData_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_SettingsDefineManagementCapabilities,
-    Cura_SettingsDefineManagementCapabilities,
+    LMI_AccountManagementServiceSettingData,
+    LMI_AccountManagementServiceSettingData,
     _cb,
-    Cura_SettingsDefineManagementCapabilitiesInitialize())
+    LMI_AccountManagementServiceSettingDataInitialize())
 
 CMAssociationMIStub( 
-    Cura_SettingsDefineManagementCapabilities,
-    Cura_SettingsDefineManagementCapabilities,
+    LMI_AccountManagementServiceSettingData,
+    LMI_AccountManagementServiceSettingData,
     _cb,
-    Cura_SettingsDefineManagementCapabilitiesInitialize())
+    LMI_AccountManagementServiceSettingDataInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_SettingsDefineManagementCapabilities",
-    "Cura_SettingsDefineManagementCapabilities",
+    "LMI_AccountManagementServiceSettingData",
+    "LMI_AccountManagementServiceSettingData",
     "instance association")
diff --git a/src/account/Cura_AccountOnSystemProvider.c b/src/account/LMI_AccountOnSystemProvider.c
index 0b1a051..478859a 100644
--- a/src/account/Cura_AccountOnSystemProvider.c
+++ b/src/account/LMI_AccountOnSystemProvider.c
@@ -1,6 +1,6 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountOnSystem.h"
-#include "Cura_Account.h"
+#include "LMI_AccountOnSystem.h"
+#include "LMI_Account.h"
 #include "CIM_ComputerSystem.h"
 
 #include <glib.h>
@@ -14,11 +14,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_AccountOnSystemInitialize()
+static void LMI_AccountOnSystemInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountOnSystemCleanup( 
+static CMPIStatus LMI_AccountOnSystemCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -26,7 +26,7 @@ static CMPIStatus Cura_AccountOnSystemCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountOnSystemEnumInstanceNames( 
+static CMPIStatus LMI_AccountOnSystemEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -36,16 +36,16 @@ static CMPIStatus Cura_AccountOnSystemEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountOnSystemEnumInstances( 
+static CMPIStatus LMI_AccountOnSystemEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_AccountRef laref;
+    LMI_AccountRef laref;
     CIM_ComputerSystemRef lcsref;
-    Cura_AccountOnSystem laos;
+    LMI_AccountOnSystem laos;
 
     CMPIObjectPath *computerSystemOP = NULL;
     CMPIStatus rc;
@@ -80,17 +80,17 @@ static CMPIStatus Cura_AccountOnSystemEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_AccountRef_Init(&laref, _cb, nameSpace);
-        Cura_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
-        Cura_AccountRef_Set_SystemName(&laref, hostname);
-        Cura_AccountRef_Set_CreationClassName(&laref,
-          Cura_Account_ClassName);
-        Cura_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
+        LMI_AccountRef_Init(&laref, _cb, nameSpace);
+        LMI_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
+        LMI_AccountRef_Set_SystemName(&laref, hostname);
+        LMI_AccountRef_Set_CreationClassName(&laref,
+          LMI_Account_ClassName);
+        LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
 
-        Cura_AccountOnSystem_Init(&laos, _cb, nameSpace);
-        Cura_AccountOnSystem_SetObjectPath_GroupComponent(&laos,
+        LMI_AccountOnSystem_Init(&laos, _cb, nameSpace);
+        LMI_AccountOnSystem_SetObjectPath_GroupComponent(&laos,
           computerSystemOP);
-        Cura_AccountOnSystem_Set_PartComponent(&laos, &laref);
+        LMI_AccountOnSystem_Set_PartComponent(&laos, &laref);
 
         KReturnInstance(cr, laos);
         lu_ent_free(lue);
@@ -105,7 +105,7 @@ static CMPIStatus Cura_AccountOnSystemEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountOnSystemGetInstance( 
+static CMPIStatus LMI_AccountOnSystemGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -116,7 +116,7 @@ static CMPIStatus Cura_AccountOnSystemGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountOnSystemCreateInstance( 
+static CMPIStatus LMI_AccountOnSystemCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -126,7 +126,7 @@ static CMPIStatus Cura_AccountOnSystemCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountOnSystemModifyInstance( 
+static CMPIStatus LMI_AccountOnSystemModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -137,7 +137,7 @@ static CMPIStatus Cura_AccountOnSystemModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountOnSystemDeleteInstance( 
+static CMPIStatus LMI_AccountOnSystemDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -146,7 +146,7 @@ static CMPIStatus Cura_AccountOnSystemDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountOnSystemExecQuery(
+static CMPIStatus LMI_AccountOnSystemExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -157,7 +157,7 @@ static CMPIStatus Cura_AccountOnSystemExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountOnSystemAssociationCleanup( 
+static CMPIStatus LMI_AccountOnSystemAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -165,7 +165,7 @@ static CMPIStatus Cura_AccountOnSystemAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountOnSystemAssociators(
+static CMPIStatus LMI_AccountOnSystemAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -182,7 +182,7 @@ static CMPIStatus Cura_AccountOnSystemAssociators(
         cc,
         cr,
         cop,
-        Cura_AccountOnSystem_ClassName,
+        LMI_AccountOnSystem_ClassName,
         assocClass,
         resultClass,
         role,
@@ -190,7 +190,7 @@ static CMPIStatus Cura_AccountOnSystemAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AccountOnSystemAssociatorNames(
+static CMPIStatus LMI_AccountOnSystemAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -206,14 +206,14 @@ static CMPIStatus Cura_AccountOnSystemAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AccountOnSystem_ClassName,
+        LMI_AccountOnSystem_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AccountOnSystemReferences(
+static CMPIStatus LMI_AccountOnSystemReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -228,13 +228,13 @@ static CMPIStatus Cura_AccountOnSystemReferences(
         cc,
         cr,
         cop,
-        Cura_AccountOnSystem_ClassName,
+        LMI_AccountOnSystem_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AccountOnSystemReferenceNames(
+static CMPIStatus LMI_AccountOnSystemReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -248,25 +248,25 @@ static CMPIStatus Cura_AccountOnSystemReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AccountOnSystem_ClassName,
+        LMI_AccountOnSystem_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AccountOnSystem,
-    Cura_AccountOnSystem,
+    LMI_AccountOnSystem,
+    LMI_AccountOnSystem,
     _cb,
-    Cura_AccountOnSystemInitialize())
+    LMI_AccountOnSystemInitialize())
 
 CMAssociationMIStub( 
-    Cura_AccountOnSystem,
-    Cura_AccountOnSystem,
+    LMI_AccountOnSystem,
+    LMI_AccountOnSystem,
     _cb,
-    Cura_AccountOnSystemInitialize())
+    LMI_AccountOnSystemInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountOnSystem",
-    "Cura_AccountOnSystem",
+    "LMI_AccountOnSystem",
+    "LMI_AccountOnSystem",
     "instance association")
diff --git a/src/account/Cura_AccountProvider.c b/src/account/LMI_AccountProvider.c
index 080dea5..0b10c44 100644
--- a/src/account/Cura_AccountProvider.c
+++ b/src/account/LMI_AccountProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "Cura_Account.h"
+#include "LMI_Account.h"
 
 #include <time.h>
 #include <stdbool.h>
@@ -20,11 +20,11 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_AccountInitialize()
+static void LMI_AccountInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountCleanup(
+static CMPIStatus LMI_AccountCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -32,7 +32,7 @@ static CMPIStatus Cura_AccountCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountEnumInstanceNames(
+static CMPIStatus LMI_AccountEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -42,14 +42,14 @@ static CMPIStatus Cura_AccountEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountEnumInstances(
+static CMPIStatus LMI_AccountEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_Account la;
+    LMI_Account la;
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
     GPtrArray *accounts = NULL;
@@ -77,47 +77,47 @@ static CMPIStatus Cura_AccountEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_Account_Init(&la, _cb, nameSpace);
-        Cura_Account_Set_CreationClassName(&la, Cura_Account_ClassName);
-        Cura_Account_Set_SystemName(&la, hostname);
-        Cura_Account_Set_SystemCreationClassName(&la, get_system_creation_class_name());
-        Cura_Account_Set_Name(&la, aux_lu_get_str(lue, LU_USERNAME));
+        LMI_Account_Init(&la, _cb, nameSpace);
+        LMI_Account_Set_CreationClassName(&la, LMI_Account_ClassName);
+        LMI_Account_Set_SystemName(&la, hostname);
+        LMI_Account_Set_SystemCreationClassName(&la, get_system_creation_class_name());
+        LMI_Account_Set_Name(&la, aux_lu_get_str(lue, LU_USERNAME));
 
-        Cura_Account_Init_OrganizationName(&la, 1); /* XXX */
-        Cura_Account_Set_OrganizationName(&la, 0, ""); /* XXX */
+        LMI_Account_Init_OrganizationName(&la, 1); /* XXX */
+        LMI_Account_Set_OrganizationName(&la, 0, ""); /* XXX */
 
         /* Need to convert long int UID to the string */
         snprintf(uid, 255, "%ld", aux_lu_get_long(lue, LU_UIDNUMBER));
-        Cura_Account_Set_UserID(&la, uid);
+        LMI_Account_Set_UserID(&la, uid);
 
-        Cura_Account_Init_Host(&la, 1);
-        Cura_Account_Set_Host(&la, 0, hostname);
-        Cura_Account_Set_ElementName(&la, aux_lu_get_str(lue, LU_GECOS));
-        Cura_Account_Set_HomeDirectory(&la, aux_lu_get_str(lue,
+        LMI_Account_Init_Host(&la, 1);
+        LMI_Account_Set_Host(&la, 0, hostname);
+        LMI_Account_Set_ElementName(&la, aux_lu_get_str(lue, LU_GECOS));
+        LMI_Account_Set_HomeDirectory(&la, aux_lu_get_str(lue,
           LU_HOMEDIRECTORY));
-        Cura_Account_Set_LoginShell(&la, aux_lu_get_str(lue, LU_LOGINSHELL));
+        LMI_Account_Set_LoginShell(&la, aux_lu_get_str(lue, LU_LOGINSHELL));
 
-        Cura_Account_Set_PasswordLastChange(&la,
+        LMI_Account_Set_PasswordLastChange(&la,
           CMNewDateTimeFromBinary(_cb,
             DAYSTOMS(aux_lu_get_long(lue, LU_SHADOWLASTCHANGE)),false, rc));
 
         password = aux_lu_get_str(lue, LU_SHADOWPASSWORD);
-        Cura_Account_Init_UserPassword(&la, 1);
-        Cura_Account_Set_UserPassword(&la, 0, password);
+        LMI_Account_Init_UserPassword(&la, 1);
+        LMI_Account_Set_UserPassword(&la, 0, password);
         /* Assume all passwords (encrypted or not) are in ascii encoding */
-        Cura_Account_Set_UserPasswordEncoding(&la, 2);
+        LMI_Account_Set_UserPasswordEncoding(&la, 2);
         if(strstr(password, ""))
 
         expire = aux_lu_get_long(lue, LU_SHADOWEXPIRE);
         if (expire != -1)
           {
             binTime = DAYSTOMS(expire);
-            Cura_Account_Set_PasswordExpiration(&la,
+            LMI_Account_Set_PasswordExpiration(&la,
                 CMNewDateTimeFromBinary(_cb, binTime, false, rc));
           }
         else
           {
-            Cura_Account_Null_PasswordExpiration(&la);
+            LMI_Account_Null_PasswordExpiration(&la);
           }
 
         KReturnInstance(cr, la);
@@ -135,7 +135,7 @@ static CMPIStatus Cura_AccountEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountGetInstance(
+static CMPIStatus LMI_AccountGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -146,7 +146,7 @@ static CMPIStatus Cura_AccountGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountCreateInstance(
+static CMPIStatus LMI_AccountCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -156,7 +156,7 @@ static CMPIStatus Cura_AccountCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountModifyInstance(
+static CMPIStatus LMI_AccountModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -167,7 +167,7 @@ static CMPIStatus Cura_AccountModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountDeleteInstance(
+static CMPIStatus LMI_AccountDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -176,7 +176,7 @@ static CMPIStatus Cura_AccountDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountExecQuery(
+static CMPIStatus LMI_AccountExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -188,12 +188,12 @@ static CMPIStatus Cura_AccountExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_Account,
-    Cura_Account,
+    LMI_Account,
+    LMI_Account,
     _cb,
-    Cura_AccountInitialize())
+    LMI_AccountInitialize())
 
-static CMPIStatus Cura_AccountMethodCleanup(
+static CMPIStatus LMI_AccountMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -201,7 +201,7 @@ static CMPIStatus Cura_AccountMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountInvokeMethod(
+static CMPIStatus LMI_AccountInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -210,21 +210,21 @@ static CMPIStatus Cura_AccountInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_Account_DispatchMethod(
+    return LMI_Account_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_Account,
-    Cura_Account,
+    LMI_Account,
+    LMI_Account,
     _cb,
-    Cura_AccountInitialize())
+    LMI_AccountInitialize())
 
-KUint32 Cura_Account_RequestStateChange(
+KUint32 LMI_Account_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_AccountRef* self,
+    const LMI_AccountRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -238,6 +238,6 @@ KUint32 Cura_Account_RequestStateChange(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_Account",
-    "Cura_Account",
+    "LMI_Account",
+    "LMI_Account",
     "instance method")
diff --git a/src/account/Cura_AccountSettingDataProvider.c b/src/account/LMI_AccountSettingDataProvider.c
index 974a5ee..b2a06e4 100644
--- a/src/account/Cura_AccountSettingDataProvider.c
+++ b/src/account/LMI_AccountSettingDataProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountSettingData.h"
+#include "LMI_AccountSettingData.h"
 
 #include "macros.h"
 #include "globals.h"
@@ -9,11 +9,11 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_AccountSettingDataInitialize()
+static void LMI_AccountSettingDataInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountSettingDataCleanup(
+static CMPIStatus LMI_AccountSettingDataCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -21,7 +21,7 @@ static CMPIStatus Cura_AccountSettingDataCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountSettingDataEnumInstanceNames(
+static CMPIStatus LMI_AccountSettingDataEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -31,7 +31,7 @@ static CMPIStatus Cura_AccountSettingDataEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountSettingDataEnumInstances(
+static CMPIStatus LMI_AccountSettingDataEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -39,7 +39,7 @@ static CMPIStatus Cura_AccountSettingDataEnumInstances(
     const char** properties)
 {
 #if 0
-    Cura_AccountSettingData lasd;
+    LMI_AccountSettingData lasd;
 
     const char *nameSpace = KNameSpace(cop);
 
@@ -56,12 +56,12 @@ static CMPIStatus Cura_AccountSettingDataEnumInstances(
     const char * mpe = lu_cfg_read_single(luc, "userdefaults/"LU_SHADOWMAX,
       NULL);
     fprintf(stderr, "Read single: %s\n", mpe);
-    Cura_AccountSettingData_Init(&lasd, _cb, nameSpace);
+    LMI_AccountSettingData_Init(&lasd, _cb, nameSpace);
 #endif
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountSettingDataGetInstance(
+static CMPIStatus LMI_AccountSettingDataGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -72,7 +72,7 @@ static CMPIStatus Cura_AccountSettingDataGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountSettingDataCreateInstance(
+static CMPIStatus LMI_AccountSettingDataCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -82,7 +82,7 @@ static CMPIStatus Cura_AccountSettingDataCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountSettingDataModifyInstance(
+static CMPIStatus LMI_AccountSettingDataModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -93,7 +93,7 @@ static CMPIStatus Cura_AccountSettingDataModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountSettingDataDeleteInstance(
+static CMPIStatus LMI_AccountSettingDataDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -102,7 +102,7 @@ static CMPIStatus Cura_AccountSettingDataDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountSettingDataExecQuery(
+static CMPIStatus LMI_AccountSettingDataExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -114,12 +114,12 @@ static CMPIStatus Cura_AccountSettingDataExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_AccountSettingData,
-    Cura_AccountSettingData,
+    LMI_AccountSettingData,
+    LMI_AccountSettingData,
     _cb,
-    Cura_AccountSettingDataInitialize())
+    LMI_AccountSettingDataInitialize())
 
-static CMPIStatus Cura_AccountSettingDataMethodCleanup(
+static CMPIStatus LMI_AccountSettingDataMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -127,7 +127,7 @@ static CMPIStatus Cura_AccountSettingDataMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountSettingDataInvokeMethod(
+static CMPIStatus LMI_AccountSettingDataInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -136,18 +136,18 @@ static CMPIStatus Cura_AccountSettingDataInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_AccountSettingData_DispatchMethod(
+    return LMI_AccountSettingData_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_AccountSettingData,
-    Cura_AccountSettingData,
+    LMI_AccountSettingData,
+    LMI_AccountSettingData,
     _cb,
-    Cura_AccountSettingDataInitialize())
+    LMI_AccountSettingDataInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountSettingData",
-    "Cura_AccountSettingData",
+    "LMI_AccountSettingData",
+    "LMI_AccountSettingData",
     "instance method")
diff --git a/src/account/Cura_AssignedAccountIdentityProvider.c b/src/account/LMI_AssignedAccountIdentityProvider.c
index 99d1407..3939058 100644
--- a/src/account/Cura_AssignedAccountIdentityProvider.c
+++ b/src/account/LMI_AssignedAccountIdentityProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_AssignedAccountIdentity.h"
-#include "Cura_Identity.h"
-#include "Cura_Account.h"
+#include "LMI_AssignedAccountIdentity.h"
+#include "LMI_Identity.h"
+#include "LMI_Account.h"
 
 #include "aux_lu.h"
 #include "macros.h"
@@ -12,11 +12,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_AssignedAccountIdentityInitialize()
+static void LMI_AssignedAccountIdentityInitialize()
 {
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityCleanup( 
+static CMPIStatus LMI_AssignedAccountIdentityCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -24,7 +24,7 @@ static CMPIStatus Cura_AssignedAccountIdentityCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityEnumInstanceNames( 
+static CMPIStatus LMI_AssignedAccountIdentityEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -34,16 +34,16 @@ static CMPIStatus Cura_AssignedAccountIdentityEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityEnumInstances( 
+static CMPIStatus LMI_AssignedAccountIdentityEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_IdentityRef liref;
-    Cura_AccountRef laref;
-    Cura_AssignedAccountIdentity laai;
+    LMI_IdentityRef liref;
+    LMI_AccountRef laref;
+    LMI_AssignedAccountIdentity laai;
 
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
@@ -67,20 +67,20 @@ static CMPIStatus Cura_AssignedAccountIdentityEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_IdentityRef_Init(&liref, _cb, nameSpace);
+        LMI_IdentityRef_Init(&liref, _cb, nameSpace);
         snprintf(uid, 255, ORGID":UID:%ld",
           aux_lu_get_long(lue, LU_UIDNUMBER));
-        Cura_IdentityRef_Set_InstanceID(&liref, uid);
+        LMI_IdentityRef_Set_InstanceID(&liref, uid);
 
-        Cura_AccountRef_Init(&laref, _cb, nameSpace);
-        Cura_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
-        Cura_AccountRef_Set_SystemName(&laref, hostname);
-        Cura_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
-        Cura_AccountRef_Set_CreationClassName(&laref, Cura_Account_ClassName);
+        LMI_AccountRef_Init(&laref, _cb, nameSpace);
+        LMI_AccountRef_Set_Name(&laref, aux_lu_get_str(lue, LU_USERNAME));
+        LMI_AccountRef_Set_SystemName(&laref, hostname);
+        LMI_AccountRef_Set_SystemCreationClassName(&laref, get_system_creation_class_name());
+        LMI_AccountRef_Set_CreationClassName(&laref, LMI_Account_ClassName);
 
-        Cura_AssignedAccountIdentity_Init(&laai, _cb, nameSpace);
-        Cura_AssignedAccountIdentity_Set_IdentityInfo(&laai, &liref);
-        Cura_AssignedAccountIdentity_Set_ManagedElement(&laai, &laref);
+        LMI_AssignedAccountIdentity_Init(&laai, _cb, nameSpace);
+        LMI_AssignedAccountIdentity_Set_IdentityInfo(&laai, &liref);
+        LMI_AssignedAccountIdentity_Set_ManagedElement(&laai, &laref);
 
         KReturnInstance(cr, laai);
         lu_ent_free(lue);
@@ -97,7 +97,7 @@ static CMPIStatus Cura_AssignedAccountIdentityEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityGetInstance( 
+static CMPIStatus LMI_AssignedAccountIdentityGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -108,7 +108,7 @@ static CMPIStatus Cura_AssignedAccountIdentityGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityCreateInstance( 
+static CMPIStatus LMI_AssignedAccountIdentityCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -118,7 +118,7 @@ static CMPIStatus Cura_AssignedAccountIdentityCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityModifyInstance( 
+static CMPIStatus LMI_AssignedAccountIdentityModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -129,7 +129,7 @@ static CMPIStatus Cura_AssignedAccountIdentityModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityDeleteInstance( 
+static CMPIStatus LMI_AssignedAccountIdentityDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -138,7 +138,7 @@ static CMPIStatus Cura_AssignedAccountIdentityDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityExecQuery(
+static CMPIStatus LMI_AssignedAccountIdentityExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -149,7 +149,7 @@ static CMPIStatus Cura_AssignedAccountIdentityExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityAssociationCleanup( 
+static CMPIStatus LMI_AssignedAccountIdentityAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -157,7 +157,7 @@ static CMPIStatus Cura_AssignedAccountIdentityAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityAssociators(
+static CMPIStatus LMI_AssignedAccountIdentityAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -174,7 +174,7 @@ static CMPIStatus Cura_AssignedAccountIdentityAssociators(
         cc,
         cr,
         cop,
-        Cura_AssignedAccountIdentity_ClassName,
+        LMI_AssignedAccountIdentity_ClassName,
         assocClass,
         resultClass,
         role,
@@ -182,7 +182,7 @@ static CMPIStatus Cura_AssignedAccountIdentityAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityAssociatorNames(
+static CMPIStatus LMI_AssignedAccountIdentityAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -198,14 +198,14 @@ static CMPIStatus Cura_AssignedAccountIdentityAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AssignedAccountIdentity_ClassName,
+        LMI_AssignedAccountIdentity_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityReferences(
+static CMPIStatus LMI_AssignedAccountIdentityReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -220,13 +220,13 @@ static CMPIStatus Cura_AssignedAccountIdentityReferences(
         cc,
         cr,
         cop,
-        Cura_AssignedAccountIdentity_ClassName,
+        LMI_AssignedAccountIdentity_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AssignedAccountIdentityReferenceNames(
+static CMPIStatus LMI_AssignedAccountIdentityReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -240,25 +240,25 @@ static CMPIStatus Cura_AssignedAccountIdentityReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AssignedAccountIdentity_ClassName,
+        LMI_AssignedAccountIdentity_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AssignedAccountIdentity,
-    Cura_AssignedAccountIdentity,
+    LMI_AssignedAccountIdentity,
+    LMI_AssignedAccountIdentity,
     _cb,
-    Cura_AssignedAccountIdentityInitialize())
+    LMI_AssignedAccountIdentityInitialize())
 
 CMAssociationMIStub( 
-    Cura_AssignedAccountIdentity,
-    Cura_AssignedAccountIdentity,
+    LMI_AssignedAccountIdentity,
+    LMI_AssignedAccountIdentity,
     _cb,
-    Cura_AssignedAccountIdentityInitialize())
+    LMI_AssignedAccountIdentityInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AssignedAccountIdentity",
-    "Cura_AssignedAccountIdentity",
+    "LMI_AssignedAccountIdentity",
+    "LMI_AssignedAccountIdentity",
     "instance association")
diff --git a/src/account/Cura_AssignedGroupIdentityProvider.c b/src/account/LMI_AssignedGroupIdentityProvider.c
index 090abbc..e7c9456 100644
--- a/src/account/Cura_AssignedGroupIdentityProvider.c
+++ b/src/account/LMI_AssignedGroupIdentityProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_AssignedGroupIdentity.h"
-#include "Cura_Identity.h"
-#include "Cura_Group.h"
+#include "LMI_AssignedGroupIdentity.h"
+#include "LMI_Identity.h"
+#include "LMI_Group.h"
 
 #include "aux_lu.h"
 #include "macros.h"
@@ -12,11 +12,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_AssignedGroupIdentityInitialize()
+static void LMI_AssignedGroupIdentityInitialize()
 {
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityCleanup( 
+static CMPIStatus LMI_AssignedGroupIdentityCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -24,7 +24,7 @@ static CMPIStatus Cura_AssignedGroupIdentityCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityEnumInstanceNames( 
+static CMPIStatus LMI_AssignedGroupIdentityEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -34,16 +34,16 @@ static CMPIStatus Cura_AssignedGroupIdentityEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityEnumInstances( 
+static CMPIStatus LMI_AssignedGroupIdentityEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_IdentityRef liref;
-    Cura_GroupRef lgref;
-    Cura_AssignedGroupIdentity lagi;
+    LMI_IdentityRef liref;
+    LMI_GroupRef lgref;
+    LMI_AssignedGroupIdentity lagi;
 
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
@@ -66,18 +66,18 @@ static CMPIStatus Cura_AssignedGroupIdentityEnumInstances(
       {
         lue = g_ptr_array_index(groups, i);
 
-        Cura_GroupRef_Init(&lgref, _cb, nameSpace);
-        Cura_GroupRef_Set_CreationClassName(&lgref, Cura_Group_ClassName);
-        Cura_GroupRef_Set_Name(&lgref, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_GroupRef_Init(&lgref, _cb, nameSpace);
+        LMI_GroupRef_Set_CreationClassName(&lgref, LMI_Group_ClassName);
+        LMI_GroupRef_Set_Name(&lgref, aux_lu_get_str(lue, LU_GROUPNAME));
 
-        Cura_IdentityRef_Init(&liref, _cb, nameSpace);
+        LMI_IdentityRef_Init(&liref, _cb, nameSpace);
         snprintf(gid, 255, ORGID":GID:%ld",
           aux_lu_get_long(lue, LU_GIDNUMBER));
-        Cura_IdentityRef_Set_InstanceID(&liref, gid);
+        LMI_IdentityRef_Set_InstanceID(&liref, gid);
 
-        Cura_AssignedGroupIdentity_Init(&lagi, _cb, nameSpace);
-        Cura_AssignedGroupIdentity_Set_IdentityInfo(&lagi, &liref);
-        Cura_AssignedGroupIdentity_Set_ManagedElement(&lagi, &lgref);
+        LMI_AssignedGroupIdentity_Init(&lagi, _cb, nameSpace);
+        LMI_AssignedGroupIdentity_Set_IdentityInfo(&lagi, &liref);
+        LMI_AssignedGroupIdentity_Set_ManagedElement(&lagi, &lgref);
 
         KReturnInstance(cr, lagi);
         lu_ent_free(lue);
@@ -86,7 +86,7 @@ static CMPIStatus Cura_AssignedGroupIdentityEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityGetInstance( 
+static CMPIStatus LMI_AssignedGroupIdentityGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -97,7 +97,7 @@ static CMPIStatus Cura_AssignedGroupIdentityGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityCreateInstance( 
+static CMPIStatus LMI_AssignedGroupIdentityCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -107,7 +107,7 @@ static CMPIStatus Cura_AssignedGroupIdentityCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityModifyInstance( 
+static CMPIStatus LMI_AssignedGroupIdentityModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -118,7 +118,7 @@ static CMPIStatus Cura_AssignedGroupIdentityModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityDeleteInstance( 
+static CMPIStatus LMI_AssignedGroupIdentityDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -127,7 +127,7 @@ static CMPIStatus Cura_AssignedGroupIdentityDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityExecQuery(
+static CMPIStatus LMI_AssignedGroupIdentityExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -138,7 +138,7 @@ static CMPIStatus Cura_AssignedGroupIdentityExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityAssociationCleanup( 
+static CMPIStatus LMI_AssignedGroupIdentityAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -146,7 +146,7 @@ static CMPIStatus Cura_AssignedGroupIdentityAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityAssociators(
+static CMPIStatus LMI_AssignedGroupIdentityAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -163,7 +163,7 @@ static CMPIStatus Cura_AssignedGroupIdentityAssociators(
         cc,
         cr,
         cop,
-        Cura_AssignedGroupIdentity_ClassName,
+        LMI_AssignedGroupIdentity_ClassName,
         assocClass,
         resultClass,
         role,
@@ -171,7 +171,7 @@ static CMPIStatus Cura_AssignedGroupIdentityAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityAssociatorNames(
+static CMPIStatus LMI_AssignedGroupIdentityAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -187,14 +187,14 @@ static CMPIStatus Cura_AssignedGroupIdentityAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AssignedGroupIdentity_ClassName,
+        LMI_AssignedGroupIdentity_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityReferences(
+static CMPIStatus LMI_AssignedGroupIdentityReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -209,13 +209,13 @@ static CMPIStatus Cura_AssignedGroupIdentityReferences(
         cc,
         cr,
         cop,
-        Cura_AssignedGroupIdentity_ClassName,
+        LMI_AssignedGroupIdentity_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AssignedGroupIdentityReferenceNames(
+static CMPIStatus LMI_AssignedGroupIdentityReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -229,25 +229,25 @@ static CMPIStatus Cura_AssignedGroupIdentityReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AssignedGroupIdentity_ClassName,
+        LMI_AssignedGroupIdentity_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AssignedGroupIdentity,
-    Cura_AssignedGroupIdentity,
+    LMI_AssignedGroupIdentity,
+    LMI_AssignedGroupIdentity,
     _cb,
-    Cura_AssignedGroupIdentityInitialize())
+    LMI_AssignedGroupIdentityInitialize())
 
 CMAssociationMIStub( 
-    Cura_AssignedGroupIdentity,
-    Cura_AssignedGroupIdentity,
+    LMI_AssignedGroupIdentity,
+    LMI_AssignedGroupIdentity,
     _cb,
-    Cura_AssignedGroupIdentityInitialize())
+    LMI_AssignedGroupIdentityInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AssignedGroupIdentity",
-    "Cura_AssignedGroupIdentity",
+    "LMI_AssignedGroupIdentity",
+    "LMI_AssignedGroupIdentity",
     "instance association")
diff --git a/src/account/Cura_ElementSettingDateProvider.c b/src/account/LMI_ElementSettingDateProvider.c
index acbc0b5..a91546f 100644
--- a/src/account/Cura_ElementSettingDateProvider.c
+++ b/src/account/LMI_ElementSettingDateProvider.c
@@ -1,13 +1,13 @@
 #include <konkret/konkret.h>
-#include "Cura_ElementSettingDate.h"
+#include "LMI_ElementSettingDate.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_ElementSettingDateInitialize()
+static void LMI_ElementSettingDateInitialize()
 {
 }
 
-static CMPIStatus Cura_ElementSettingDateCleanup( 
+static CMPIStatus LMI_ElementSettingDateCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -15,7 +15,7 @@ static CMPIStatus Cura_ElementSettingDateCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementSettingDateEnumInstanceNames( 
+static CMPIStatus LMI_ElementSettingDateEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -25,7 +25,7 @@ static CMPIStatus Cura_ElementSettingDateEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_ElementSettingDateEnumInstances( 
+static CMPIStatus LMI_ElementSettingDateEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -35,7 +35,7 @@ static CMPIStatus Cura_ElementSettingDateEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementSettingDateGetInstance( 
+static CMPIStatus LMI_ElementSettingDateGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -46,7 +46,7 @@ static CMPIStatus Cura_ElementSettingDateGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_ElementSettingDateCreateInstance( 
+static CMPIStatus LMI_ElementSettingDateCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -56,7 +56,7 @@ static CMPIStatus Cura_ElementSettingDateCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementSettingDateModifyInstance( 
+static CMPIStatus LMI_ElementSettingDateModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -67,7 +67,7 @@ static CMPIStatus Cura_ElementSettingDateModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementSettingDateDeleteInstance( 
+static CMPIStatus LMI_ElementSettingDateDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -76,7 +76,7 @@ static CMPIStatus Cura_ElementSettingDateDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementSettingDateExecQuery(
+static CMPIStatus LMI_ElementSettingDateExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -87,7 +87,7 @@ static CMPIStatus Cura_ElementSettingDateExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementSettingDateAssociationCleanup( 
+static CMPIStatus LMI_ElementSettingDateAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -95,7 +95,7 @@ static CMPIStatus Cura_ElementSettingDateAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementSettingDateAssociators(
+static CMPIStatus LMI_ElementSettingDateAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -112,7 +112,7 @@ static CMPIStatus Cura_ElementSettingDateAssociators(
         cc,
         cr,
         cop,
-        Cura_ElementSettingDate_ClassName,
+        LMI_ElementSettingDate_ClassName,
         assocClass,
         resultClass,
         role,
@@ -120,7 +120,7 @@ static CMPIStatus Cura_ElementSettingDateAssociators(
         properties);
 }
 
-static CMPIStatus Cura_ElementSettingDateAssociatorNames(
+static CMPIStatus LMI_ElementSettingDateAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -136,14 +136,14 @@ static CMPIStatus Cura_ElementSettingDateAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_ElementSettingDate_ClassName,
+        LMI_ElementSettingDate_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_ElementSettingDateReferences(
+static CMPIStatus LMI_ElementSettingDateReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -158,13 +158,13 @@ static CMPIStatus Cura_ElementSettingDateReferences(
         cc,
         cr,
         cop,
-        Cura_ElementSettingDate_ClassName,
+        LMI_ElementSettingDate_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_ElementSettingDateReferenceNames(
+static CMPIStatus LMI_ElementSettingDateReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,25 +178,25 @@ static CMPIStatus Cura_ElementSettingDateReferenceNames(
         cc,
         cr,
         cop,
-        Cura_ElementSettingDate_ClassName,
+        LMI_ElementSettingDate_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_ElementSettingDate,
-    Cura_ElementSettingDate,
+    LMI_ElementSettingDate,
+    LMI_ElementSettingDate,
     _cb,
-    Cura_ElementSettingDateInitialize())
+    LMI_ElementSettingDateInitialize())
 
 CMAssociationMIStub( 
-    Cura_ElementSettingDate,
-    Cura_ElementSettingDate,
+    LMI_ElementSettingDate,
+    LMI_ElementSettingDate,
     _cb,
-    Cura_ElementSettingDateInitialize())
+    LMI_ElementSettingDateInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_ElementSettingDate",
-    "Cura_ElementSettingDate",
+    "LMI_ElementSettingDate",
+    "LMI_ElementSettingDate",
     "instance association")
diff --git a/src/account/Cura_EnabledAccountCapabilitiesProvider.c b/src/account/LMI_EnabledAccountCapabilitiesProvider.c
index b8ba152..4c1d078 100644
--- a/src/account/Cura_EnabledAccountCapabilitiesProvider.c
+++ b/src/account/LMI_EnabledAccountCapabilitiesProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "Cura_EnabledAccountCapabilities.h"
+#include "LMI_EnabledAccountCapabilities.h"
 
 #include "macros.h"
 #include "globals.h"
@@ -8,11 +8,11 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_EnabledAccountCapabilitiesInitialize()
+static void LMI_EnabledAccountCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesCleanup(
+static CMPIStatus LMI_EnabledAccountCapabilitiesCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -20,7 +20,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesEnumInstanceNames(
+static CMPIStatus LMI_EnabledAccountCapabilitiesEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -30,22 +30,22 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesEnumInstances(
+static CMPIStatus LMI_EnabledAccountCapabilitiesEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_EnabledAccountCapabilities leac;
+    LMI_EnabledAccountCapabilities leac;
 
     const char *nameSpace = KNameSpace(cop);
 
-    Cura_EnabledAccountCapabilities_Init(&leac, _cb, nameSpace);
-    Cura_EnabledAccountCapabilities_Set_InstanceID(&leac, ORGID":"LEACNAME);
-    Cura_EnabledAccountCapabilities_Set_ElementName(&leac, LEACNAME);
-    Cura_EnabledAccountCapabilities_Init_RequestedStatesSupported(&leac, 0);
-    Cura_EnabledAccountCapabilities_Set_ElementNameEditSupported(&leac,
+    LMI_EnabledAccountCapabilities_Init(&leac, _cb, nameSpace);
+    LMI_EnabledAccountCapabilities_Set_InstanceID(&leac, ORGID":"LEACNAME);
+    LMI_EnabledAccountCapabilities_Set_ElementName(&leac, LEACNAME);
+    LMI_EnabledAccountCapabilities_Init_RequestedStatesSupported(&leac, 0);
+    LMI_EnabledAccountCapabilities_Set_ElementNameEditSupported(&leac,
       false);
 
     KReturnInstance(cr, leac);
@@ -53,7 +53,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesGetInstance(
+static CMPIStatus LMI_EnabledAccountCapabilitiesGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -64,7 +64,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesCreateInstance(
+static CMPIStatus LMI_EnabledAccountCapabilitiesCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -74,7 +74,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesModifyInstance(
+static CMPIStatus LMI_EnabledAccountCapabilitiesModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -85,7 +85,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesDeleteInstance(
+static CMPIStatus LMI_EnabledAccountCapabilitiesDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -94,7 +94,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesExecQuery(
+static CMPIStatus LMI_EnabledAccountCapabilitiesExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -106,12 +106,12 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_EnabledAccountCapabilities,
-    Cura_EnabledAccountCapabilities,
+    LMI_EnabledAccountCapabilities,
+    LMI_EnabledAccountCapabilities,
     _cb,
-    Cura_EnabledAccountCapabilitiesInitialize())
+    LMI_EnabledAccountCapabilitiesInitialize())
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesMethodCleanup(
+static CMPIStatus LMI_EnabledAccountCapabilitiesMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -119,7 +119,7 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_EnabledAccountCapabilitiesInvokeMethod(
+static CMPIStatus LMI_EnabledAccountCapabilitiesInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -128,18 +128,18 @@ static CMPIStatus Cura_EnabledAccountCapabilitiesInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_EnabledAccountCapabilities_DispatchMethod(
+    return LMI_EnabledAccountCapabilities_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_EnabledAccountCapabilities,
-    Cura_EnabledAccountCapabilities,
+    LMI_EnabledAccountCapabilities,
+    LMI_EnabledAccountCapabilities,
     _cb,
-    Cura_EnabledAccountCapabilitiesInitialize())
+    LMI_EnabledAccountCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_EnabledAccountCapabilities",
-    "Cura_EnabledAccountCapabilities",
+    "LMI_EnabledAccountCapabilities",
+    "LMI_EnabledAccountCapabilities",
     "instance method")
diff --git a/src/account/Cura_GroupProvider.c b/src/account/LMI_GroupProvider.c
index 1e585e4..5de5318 100644
--- a/src/account/Cura_GroupProvider.c
+++ b/src/account/LMI_GroupProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "Cura_Group.h"
+#include "LMI_Group.h"
 
 #include <libuser/entity.h>
 #include <libuser/user.h>
@@ -10,11 +10,11 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_GroupInitialize()
+static void LMI_GroupInitialize()
 {
 }
 
-static CMPIStatus Cura_GroupCleanup(
+static CMPIStatus LMI_GroupCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -22,7 +22,7 @@ static CMPIStatus Cura_GroupCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_GroupEnumInstanceNames(
+static CMPIStatus LMI_GroupEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -32,14 +32,14 @@ static CMPIStatus Cura_GroupEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_GroupEnumInstances(
+static CMPIStatus LMI_GroupEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_Group lg;
+    LMI_Group lg;
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
     GPtrArray *groups = NULL;
@@ -61,14 +61,14 @@ static CMPIStatus Cura_GroupEnumInstances(
       {
         lue = g_ptr_array_index(groups, i);
 
-        Cura_Group_Init(&lg, _cb, nameSpace);
-        Cura_Group_Set_CreationClassName(&lg, Cura_Group_ClassName);
-        Cura_Group_Set_Name(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
-        Cura_Group_Set_ElementName(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
-        Cura_Group_Set_CommonName(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_Group_Init(&lg, _cb, nameSpace);
+        LMI_Group_Set_CreationClassName(&lg, LMI_Group_ClassName);
+        LMI_Group_Set_Name(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_Group_Set_ElementName(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_Group_Set_CommonName(&lg, aux_lu_get_str(lue, LU_GROUPNAME));
         snprintf(instanceid, 255, ORGID":GID:%ld",
           aux_lu_get_long(lue, LU_GIDNUMBER));
-        Cura_Group_Set_InstanceID(&lg, instanceid);
+        LMI_Group_Set_InstanceID(&lg, instanceid);
         KReturnInstance(cr, lg);
         lu_ent_free(lue);
       } /* for */
@@ -84,7 +84,7 @@ static CMPIStatus Cura_GroupEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_GroupGetInstance(
+static CMPIStatus LMI_GroupGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -95,7 +95,7 @@ static CMPIStatus Cura_GroupGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_GroupCreateInstance(
+static CMPIStatus LMI_GroupCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -105,7 +105,7 @@ static CMPIStatus Cura_GroupCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_GroupModifyInstance(
+static CMPIStatus LMI_GroupModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -116,7 +116,7 @@ static CMPIStatus Cura_GroupModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_GroupDeleteInstance(
+static CMPIStatus LMI_GroupDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -125,7 +125,7 @@ static CMPIStatus Cura_GroupDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_GroupExecQuery(
+static CMPIStatus LMI_GroupExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -137,12 +137,12 @@ static CMPIStatus Cura_GroupExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_Group,
-    Cura_Group,
+    LMI_Group,
+    LMI_Group,
     _cb,
-    Cura_GroupInitialize())
+    LMI_GroupInitialize())
 
-static CMPIStatus Cura_GroupMethodCleanup(
+static CMPIStatus LMI_GroupMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -150,7 +150,7 @@ static CMPIStatus Cura_GroupMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_GroupInvokeMethod(
+static CMPIStatus LMI_GroupInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -159,18 +159,18 @@ static CMPIStatus Cura_GroupInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_Group_DispatchMethod(
+    return LMI_Group_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_Group,
-    Cura_Group,
+    LMI_Group,
+    LMI_Group,
     _cb,
-    Cura_GroupInitialize())
+    LMI_GroupInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_Group",
-    "Cura_Group",
+    "LMI_Group",
+    "LMI_Group",
     "instance method")
diff --git a/src/account/Cura_HostedServiceProvider.c b/src/account/LMI_HostedServiceProvider.c
index 2e252e7..48a7b6b 100644
--- a/src/account/Cura_HostedServiceProvider.c
+++ b/src/account/LMI_HostedServiceProvider.c
@@ -1,18 +1,18 @@
 #include <konkret/konkret.h>
-#include "Cura_HostedService.h"
+#include "LMI_HostedService.h"
 #include "CIM_ComputerSystem.h"
-#include "Cura_AccountManagementService.h"
+#include "LMI_AccountManagementService.h"
 
 #include "macros.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_HostedServiceInitialize()
+static void LMI_HostedServiceInitialize()
 {
 }
 
-static CMPIStatus Cura_HostedServiceCleanup( 
+static CMPIStatus LMI_HostedServiceCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -20,7 +20,7 @@ static CMPIStatus Cura_HostedServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceEnumInstanceNames( 
+static CMPIStatus LMI_HostedServiceEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -30,7 +30,7 @@ static CMPIStatus Cura_HostedServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_HostedServiceEnumInstances( 
+static CMPIStatus LMI_HostedServiceEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -38,8 +38,8 @@ static CMPIStatus Cura_HostedServiceEnumInstances(
     const char** properties) 
 {
     CIM_ComputerSystemRef lcsref;
-    Cura_AccountManagementServiceRef lamsref;
-    Cura_HostedService lhs;
+    LMI_AccountManagementServiceRef lamsref;
+    LMI_HostedService lhs;
 
     CMPIObjectPath *computerSystemOP = NULL;
     CMPIStatus rc;
@@ -56,23 +56,23 @@ static CMPIStatus Cura_HostedServiceEnumInstances(
     computerSystemOP->ft->setClassName(computerSystemOP,
       get_system_creation_class_name());
 
-    Cura_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
-    Cura_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
-    Cura_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
+    LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
+    LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
+    LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
       get_system_creation_class_name());
-    Cura_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
-    Cura_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
-      Cura_AccountManagementService_ClassName);
+    LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
+    LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
+      LMI_AccountManagementService_ClassName);
 
-    Cura_HostedService_Init(&lhs, _cb, nameSpace);
-    Cura_HostedService_SetObjectPath_Antecedent(&lhs, computerSystemOP);
-    Cura_HostedService_Set_Dependent(&lhs, &lamsref);
+    LMI_HostedService_Init(&lhs, _cb, nameSpace);
+    LMI_HostedService_SetObjectPath_Antecedent(&lhs, computerSystemOP);
+    LMI_HostedService_Set_Dependent(&lhs, &lamsref);
 
     KReturnInstance(cr, lhs);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceGetInstance( 
+static CMPIStatus LMI_HostedServiceGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -83,7 +83,7 @@ static CMPIStatus Cura_HostedServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_HostedServiceCreateInstance( 
+static CMPIStatus LMI_HostedServiceCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -93,7 +93,7 @@ static CMPIStatus Cura_HostedServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceModifyInstance( 
+static CMPIStatus LMI_HostedServiceModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -104,7 +104,7 @@ static CMPIStatus Cura_HostedServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceDeleteInstance( 
+static CMPIStatus LMI_HostedServiceDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -113,7 +113,7 @@ static CMPIStatus Cura_HostedServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceExecQuery(
+static CMPIStatus LMI_HostedServiceExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -124,7 +124,7 @@ static CMPIStatus Cura_HostedServiceExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceAssociationCleanup( 
+static CMPIStatus LMI_HostedServiceAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -132,7 +132,7 @@ static CMPIStatus Cura_HostedServiceAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceAssociators(
+static CMPIStatus LMI_HostedServiceAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -149,7 +149,7 @@ static CMPIStatus Cura_HostedServiceAssociators(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         resultClass,
         role,
@@ -157,7 +157,7 @@ static CMPIStatus Cura_HostedServiceAssociators(
         properties);
 }
 
-static CMPIStatus Cura_HostedServiceAssociatorNames(
+static CMPIStatus LMI_HostedServiceAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -173,14 +173,14 @@ static CMPIStatus Cura_HostedServiceAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_HostedServiceReferences(
+static CMPIStatus LMI_HostedServiceReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -195,13 +195,13 @@ static CMPIStatus Cura_HostedServiceReferences(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_HostedServiceReferenceNames(
+static CMPIStatus LMI_HostedServiceReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -215,25 +215,25 @@ static CMPIStatus Cura_HostedServiceReferenceNames(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_HostedService,
-    Cura_HostedService,
+    LMI_HostedService,
+    LMI_HostedService,
     _cb,
-    Cura_HostedServiceInitialize())
+    LMI_HostedServiceInitialize())
 
 CMAssociationMIStub( 
-    Cura_HostedService,
-    Cura_HostedService,
+    LMI_HostedService,
+    LMI_HostedService,
     _cb,
-    Cura_HostedServiceInitialize())
+    LMI_HostedServiceInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_HostedService",
-    "Cura_HostedService",
+    "LMI_HostedService",
+    "LMI_HostedService",
     "instance association")
diff --git a/src/account/Cura_IdentityProvider.c b/src/account/LMI_IdentityProvider.c
index 9277239..0e7a3b6 100644
--- a/src/account/Cura_IdentityProvider.c
+++ b/src/account/LMI_IdentityProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "Cura_Identity.h"
+#include "LMI_Identity.h"
 
 #include <libuser/entity.h>
 #include <libuser/user.h>
@@ -10,11 +10,11 @@
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_IdentityInitialize()
+static void LMI_IdentityInitialize()
 {
 }
 
-static CMPIStatus Cura_IdentityCleanup(
+static CMPIStatus LMI_IdentityCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -22,7 +22,7 @@ static CMPIStatus Cura_IdentityCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_IdentityEnumInstanceNames(
+static CMPIStatus LMI_IdentityEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -32,14 +32,14 @@ static CMPIStatus Cura_IdentityEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_IdentityEnumInstances(
+static CMPIStatus LMI_IdentityEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_Identity li;
+    LMI_Identity li;
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
     GPtrArray *accounts = NULL;
@@ -62,13 +62,13 @@ static CMPIStatus Cura_IdentityEnumInstances(
     for (i = 0;  (accounts != NULL) && (i < accounts->len); i++)
       {
         lue = g_ptr_array_index(accounts, i);
-        Cura_Identity_Init(&li, _cb, nameSpace);
+        LMI_Identity_Init(&li, _cb, nameSpace);
 
         /* Need to convert long int UID to the string */
         snprintf(instanceid, 255, ORGID":UID:%ld",
           aux_lu_get_long(lue, LU_UIDNUMBER));
-        Cura_Identity_Set_InstanceID(&li, instanceid);
-        Cura_Identity_Set_ElementName(&li, aux_lu_get_str(lue, LU_GECOS));
+        LMI_Identity_Set_InstanceID(&li, instanceid);
+        LMI_Identity_Set_ElementName(&li, aux_lu_get_str(lue, LU_GECOS));
         KReturnInstance(cr, li);
       }
 
@@ -77,13 +77,13 @@ static CMPIStatus Cura_IdentityEnumInstances(
     for (i = 0;  (accounts != NULL) && (i < accounts->len); i++)
       {
         lue = g_ptr_array_index(accounts, i);
-        Cura_Identity_Init(&li, _cb, nameSpace);
+        LMI_Identity_Init(&li, _cb, nameSpace);
 
         /* Need to convert long int UID to the string */
         snprintf(instanceid, 255, ORGID":GID:%ld",
           aux_lu_get_long(lue, LU_GIDNUMBER));
-        Cura_Identity_Set_InstanceID(&li, instanceid);
-        Cura_Identity_Set_ElementName(&li, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_Identity_Set_InstanceID(&li, instanceid);
+        LMI_Identity_Set_ElementName(&li, aux_lu_get_str(lue, LU_GROUPNAME));
         KReturnInstance(cr, li);
         lu_ent_free(lue);
       }
@@ -98,7 +98,7 @@ static CMPIStatus Cura_IdentityEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_IdentityGetInstance(
+static CMPIStatus LMI_IdentityGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -109,7 +109,7 @@ static CMPIStatus Cura_IdentityGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_IdentityCreateInstance(
+static CMPIStatus LMI_IdentityCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -119,7 +119,7 @@ static CMPIStatus Cura_IdentityCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_IdentityModifyInstance(
+static CMPIStatus LMI_IdentityModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -130,7 +130,7 @@ static CMPIStatus Cura_IdentityModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_IdentityDeleteInstance(
+static CMPIStatus LMI_IdentityDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -139,7 +139,7 @@ static CMPIStatus Cura_IdentityDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_IdentityExecQuery(
+static CMPIStatus LMI_IdentityExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -151,12 +151,12 @@ static CMPIStatus Cura_IdentityExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_Identity,
-    Cura_Identity,
+    LMI_Identity,
+    LMI_Identity,
     _cb,
-    Cura_IdentityInitialize())
+    LMI_IdentityInitialize())
 
-static CMPIStatus Cura_IdentityMethodCleanup(
+static CMPIStatus LMI_IdentityMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -164,7 +164,7 @@ static CMPIStatus Cura_IdentityMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_IdentityInvokeMethod(
+static CMPIStatus LMI_IdentityInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -173,18 +173,18 @@ static CMPIStatus Cura_IdentityInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_Identity_DispatchMethod(
+    return LMI_Identity_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_Identity,
-    Cura_Identity,
+    LMI_Identity,
+    LMI_Identity,
     _cb,
-    Cura_IdentityInitialize())
+    LMI_IdentityInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_Identity",
-    "Cura_Identity",
+    "LMI_Identity",
+    "LMI_Identity",
     "instance method")
diff --git a/src/account/Cura_MemberOfGroupProvider.c b/src/account/LMI_MemberOfGroupProvider.c
index 1190fb6..2204bc8 100644
--- a/src/account/Cura_MemberOfGroupProvider.c
+++ b/src/account/LMI_MemberOfGroupProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_MemberOfGroup.h"
-#include "Cura_Group.h"
-#include "Cura_Identity.h"
+#include "LMI_MemberOfGroup.h"
+#include "LMI_Group.h"
+#include "LMI_Identity.h"
 
 #include "aux_lu.h"
 #include "macros.h"
@@ -12,11 +12,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_MemberOfGroupInitialize()
+static void LMI_MemberOfGroupInitialize()
 {
 }
 
-static CMPIStatus Cura_MemberOfGroupCleanup( 
+static CMPIStatus LMI_MemberOfGroupCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -24,7 +24,7 @@ static CMPIStatus Cura_MemberOfGroupCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_MemberOfGroupEnumInstanceNames( 
+static CMPIStatus LMI_MemberOfGroupEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -34,16 +34,16 @@ static CMPIStatus Cura_MemberOfGroupEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_MemberOfGroupEnumInstances( 
+static CMPIStatus LMI_MemberOfGroupEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_GroupRef lgref;
-    Cura_IdentityRef liref;
-    Cura_MemberOfGroup lmog;
+    LMI_GroupRef lgref;
+    LMI_IdentityRef liref;
+    LMI_MemberOfGroup lmog;
 
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
@@ -68,9 +68,9 @@ static CMPIStatus Cura_MemberOfGroupEnumInstances(
     for (i = 0;  (groups != NULL) && (i < groups->len); i++)
       {
         lueg = g_ptr_array_index(groups, i);
-        Cura_GroupRef_Init(&lgref, _cb, nameSpace);
-        Cura_GroupRef_Set_CreationClassName(&lgref, Cura_Group_ClassName);
-        Cura_GroupRef_Set_Name(&lgref, aux_lu_get_str(lueg, LU_GROUPNAME));
+        LMI_GroupRef_Init(&lgref, _cb, nameSpace);
+        LMI_GroupRef_Set_CreationClassName(&lgref, LMI_Group_ClassName);
+        LMI_GroupRef_Set_Name(&lgref, aux_lu_get_str(lueg, LU_GROUPNAME));
 
         /* For each user in the group */
         accounts = lu_users_enumerate_by_group(luc,
@@ -83,12 +83,12 @@ static CMPIStatus Cura_MemberOfGroupEnumInstances(
               luea, &error);
             snprintf(uid, 255, ORGID":UID:%ld",
               aux_lu_get_long(luea, LU_UIDNUMBER));
-            Cura_IdentityRef_Init(&liref, _cb, nameSpace);
-            Cura_IdentityRef_Set_InstanceID(&liref, uid);
+            LMI_IdentityRef_Init(&liref, _cb, nameSpace);
+            LMI_IdentityRef_Set_InstanceID(&liref, uid);
 
-            Cura_MemberOfGroup_Init(&lmog, _cb, nameSpace);
-            Cura_MemberOfGroup_Set_Collection(&lmog, &lgref);
-            Cura_MemberOfGroup_Set_Member(&lmog, &liref);
+            LMI_MemberOfGroup_Init(&lmog, _cb, nameSpace);
+            LMI_MemberOfGroup_Set_Collection(&lmog, &lgref);
+            LMI_MemberOfGroup_Set_Member(&lmog, &liref);
 
             KReturnInstance(cr, lmog);
             lu_ent_free(luea);
@@ -113,7 +113,7 @@ static CMPIStatus Cura_MemberOfGroupEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_MemberOfGroupGetInstance( 
+static CMPIStatus LMI_MemberOfGroupGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -124,7 +124,7 @@ static CMPIStatus Cura_MemberOfGroupGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_MemberOfGroupCreateInstance( 
+static CMPIStatus LMI_MemberOfGroupCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -134,7 +134,7 @@ static CMPIStatus Cura_MemberOfGroupCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_MemberOfGroupModifyInstance( 
+static CMPIStatus LMI_MemberOfGroupModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -145,7 +145,7 @@ static CMPIStatus Cura_MemberOfGroupModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_MemberOfGroupDeleteInstance( 
+static CMPIStatus LMI_MemberOfGroupDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -154,7 +154,7 @@ static CMPIStatus Cura_MemberOfGroupDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_MemberOfGroupExecQuery(
+static CMPIStatus LMI_MemberOfGroupExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -165,7 +165,7 @@ static CMPIStatus Cura_MemberOfGroupExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_MemberOfGroupAssociationCleanup( 
+static CMPIStatus LMI_MemberOfGroupAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -173,7 +173,7 @@ static CMPIStatus Cura_MemberOfGroupAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_MemberOfGroupAssociators(
+static CMPIStatus LMI_MemberOfGroupAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -190,7 +190,7 @@ static CMPIStatus Cura_MemberOfGroupAssociators(
         cc,
         cr,
         cop,
-        Cura_MemberOfGroup_ClassName,
+        LMI_MemberOfGroup_ClassName,
         assocClass,
         resultClass,
         role,
@@ -198,7 +198,7 @@ static CMPIStatus Cura_MemberOfGroupAssociators(
         properties);
 }
 
-static CMPIStatus Cura_MemberOfGroupAssociatorNames(
+static CMPIStatus LMI_MemberOfGroupAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -214,14 +214,14 @@ static CMPIStatus Cura_MemberOfGroupAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_MemberOfGroup_ClassName,
+        LMI_MemberOfGroup_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_MemberOfGroupReferences(
+static CMPIStatus LMI_MemberOfGroupReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -236,13 +236,13 @@ static CMPIStatus Cura_MemberOfGroupReferences(
         cc,
         cr,
         cop,
-        Cura_MemberOfGroup_ClassName,
+        LMI_MemberOfGroup_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_MemberOfGroupReferenceNames(
+static CMPIStatus LMI_MemberOfGroupReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -256,25 +256,25 @@ static CMPIStatus Cura_MemberOfGroupReferenceNames(
         cc,
         cr,
         cop,
-        Cura_MemberOfGroup_ClassName,
+        LMI_MemberOfGroup_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_MemberOfGroup,
-    Cura_MemberOfGroup,
+    LMI_MemberOfGroup,
+    LMI_MemberOfGroup,
     _cb,
-    Cura_MemberOfGroupInitialize())
+    LMI_MemberOfGroupInitialize())
 
 CMAssociationMIStub( 
-    Cura_MemberOfGroup,
-    Cura_MemberOfGroup,
+    LMI_MemberOfGroup,
+    LMI_MemberOfGroup,
     _cb,
-    Cura_MemberOfGroupInitialize())
+    LMI_MemberOfGroupInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_MemberOfGroup",
-    "Cura_MemberOfGroup",
+    "LMI_MemberOfGroup",
+    "LMI_MemberOfGroup",
     "instance association")
diff --git a/src/account/Cura_OwningGroupProvider.c b/src/account/LMI_OwningGroupProvider.c
index f4592f2..417f204 100644
--- a/src/account/Cura_OwningGroupProvider.c
+++ b/src/account/LMI_OwningGroupProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_OwningGroup.h"
+#include "LMI_OwningGroup.h"
 #include "CIM_ComputerSystem.h"
-#include "Cura_Group.h"
+#include "LMI_Group.h"
 
 #include "macros.h"
 #include "globals.h"
@@ -12,11 +12,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_OwningGroupInitialize()
+static void LMI_OwningGroupInitialize()
 {
 }
 
-static CMPIStatus Cura_OwningGroupCleanup( 
+static CMPIStatus LMI_OwningGroupCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -24,7 +24,7 @@ static CMPIStatus Cura_OwningGroupCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_OwningGroupEnumInstanceNames( 
+static CMPIStatus LMI_OwningGroupEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -34,7 +34,7 @@ static CMPIStatus Cura_OwningGroupEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_OwningGroupEnumInstances( 
+static CMPIStatus LMI_OwningGroupEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -42,8 +42,8 @@ static CMPIStatus Cura_OwningGroupEnumInstances(
     const char** properties) 
 {
     CIM_ComputerSystemRef lcsref;
-    Cura_GroupRef lgref;
-    Cura_OwningGroup log;
+    LMI_GroupRef lgref;
+    LMI_OwningGroup log;
 
     CMPIObjectPath *computerSystemOP = NULL;
     CMPIStatus rc;
@@ -77,13 +77,13 @@ static CMPIStatus Cura_OwningGroupEnumInstances(
       {
         lue = g_ptr_array_index(groups, i);
 
-        Cura_GroupRef_Init(&lgref, _cb, nameSpace);
-        Cura_GroupRef_Set_Name(&lgref, aux_lu_get_str(lue, LU_GROUPNAME));
-        Cura_GroupRef_Set_CreationClassName(&lgref, Cura_Group_ClassName);
+        LMI_GroupRef_Init(&lgref, _cb, nameSpace);
+        LMI_GroupRef_Set_Name(&lgref, aux_lu_get_str(lue, LU_GROUPNAME));
+        LMI_GroupRef_Set_CreationClassName(&lgref, LMI_Group_ClassName);
 
-        Cura_OwningGroup_Init(&log, _cb, nameSpace);
-        Cura_OwningGroup_SetObjectPath_OwningElement(&log, computerSystemOP);
-        Cura_OwningGroup_Set_OwnedElement(&log, &lgref);
+        LMI_OwningGroup_Init(&log, _cb, nameSpace);
+        LMI_OwningGroup_SetObjectPath_OwningElement(&log, computerSystemOP);
+        LMI_OwningGroup_Set_OwnedElement(&log, &lgref);
 
         KReturnInstance(cr, log);
         lu_ent_free(lue);
@@ -99,7 +99,7 @@ static CMPIStatus Cura_OwningGroupEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_OwningGroupGetInstance( 
+static CMPIStatus LMI_OwningGroupGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -110,7 +110,7 @@ static CMPIStatus Cura_OwningGroupGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_OwningGroupCreateInstance( 
+static CMPIStatus LMI_OwningGroupCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -120,7 +120,7 @@ static CMPIStatus Cura_OwningGroupCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_OwningGroupModifyInstance( 
+static CMPIStatus LMI_OwningGroupModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -131,7 +131,7 @@ static CMPIStatus Cura_OwningGroupModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_OwningGroupDeleteInstance( 
+static CMPIStatus LMI_OwningGroupDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -140,7 +140,7 @@ static CMPIStatus Cura_OwningGroupDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_OwningGroupExecQuery(
+static CMPIStatus LMI_OwningGroupExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -151,7 +151,7 @@ static CMPIStatus Cura_OwningGroupExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_OwningGroupAssociationCleanup( 
+static CMPIStatus LMI_OwningGroupAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -159,7 +159,7 @@ static CMPIStatus Cura_OwningGroupAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_OwningGroupAssociators(
+static CMPIStatus LMI_OwningGroupAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -176,7 +176,7 @@ static CMPIStatus Cura_OwningGroupAssociators(
         cc,
         cr,
         cop,
-        Cura_OwningGroup_ClassName,
+        LMI_OwningGroup_ClassName,
         assocClass,
         resultClass,
         role,
@@ -184,7 +184,7 @@ static CMPIStatus Cura_OwningGroupAssociators(
         properties);
 }
 
-static CMPIStatus Cura_OwningGroupAssociatorNames(
+static CMPIStatus LMI_OwningGroupAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -200,14 +200,14 @@ static CMPIStatus Cura_OwningGroupAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_OwningGroup_ClassName,
+        LMI_OwningGroup_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_OwningGroupReferences(
+static CMPIStatus LMI_OwningGroupReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -222,13 +222,13 @@ static CMPIStatus Cura_OwningGroupReferences(
         cc,
         cr,
         cop,
-        Cura_OwningGroup_ClassName,
+        LMI_OwningGroup_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_OwningGroupReferenceNames(
+static CMPIStatus LMI_OwningGroupReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -242,25 +242,25 @@ static CMPIStatus Cura_OwningGroupReferenceNames(
         cc,
         cr,
         cop,
-        Cura_OwningGroup_ClassName,
+        LMI_OwningGroup_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_OwningGroup,
-    Cura_OwningGroup,
+    LMI_OwningGroup,
+    LMI_OwningGroup,
     _cb,
-    Cura_OwningGroupInitialize())
+    LMI_OwningGroupInitialize())
 
 CMAssociationMIStub( 
-    Cura_OwningGroup,
-    Cura_OwningGroup,
+    LMI_OwningGroup,
+    LMI_OwningGroup,
     _cb,
-    Cura_OwningGroupInitialize())
+    LMI_OwningGroupInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_OwningGroup",
-    "Cura_OwningGroup",
+    "LMI_OwningGroup",
+    "LMI_OwningGroup",
     "instance association")
diff --git a/src/account/Cura_ServiceAffectsIdentityProvider.c b/src/account/LMI_ServiceAffectsIdentityProvider.c
index c62be93..ccbcd97 100644
--- a/src/account/Cura_ServiceAffectsIdentityProvider.c
+++ b/src/account/LMI_ServiceAffectsIdentityProvider.c
@@ -1,7 +1,7 @@
 #include <konkret/konkret.h>
-#include "Cura_ServiceAffectsIdentity.h"
-#include "Cura_AccountManagementService.h"
-#include "Cura_Identity.h"
+#include "LMI_ServiceAffectsIdentity.h"
+#include "LMI_AccountManagementService.h"
+#include "LMI_Identity.h"
 
 #include "macros.h"
 #include "globals.h"
@@ -12,11 +12,11 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_ServiceAffectsIdentityInitialize()
+static void LMI_ServiceAffectsIdentityInitialize()
 {
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityCleanup( 
+static CMPIStatus LMI_ServiceAffectsIdentityCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -24,7 +24,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityEnumInstanceNames( 
+static CMPIStatus LMI_ServiceAffectsIdentityEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -34,16 +34,16 @@ static CMPIStatus Cura_ServiceAffectsIdentityEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityEnumInstances( 
+static CMPIStatus LMI_ServiceAffectsIdentityEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    Cura_IdentityRef liref;
-    Cura_AccountManagementServiceRef lamsref;
-    Cura_ServiceAffectsIdentity lsai;
+    LMI_IdentityRef liref;
+    LMI_AccountManagementServiceRef lamsref;
+    LMI_ServiceAffectsIdentity lsai;
 
     struct lu_context *luc = NULL;
     struct lu_error *error = NULL;
@@ -55,13 +55,13 @@ static CMPIStatus Cura_ServiceAffectsIdentityEnumInstances(
     const char *nameSpace = KNameSpace(cop);
     const char *hostname = get_system_name();
 
-    Cura_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
-    Cura_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
-    Cura_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
+    LMI_AccountManagementServiceRef_Init(&lamsref, _cb, nameSpace);
+    LMI_AccountManagementServiceRef_Set_Name(&lamsref, LAMSNAME);
+    LMI_AccountManagementServiceRef_Set_SystemCreationClassName(&lamsref,
       get_system_creation_class_name());
-    Cura_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
-    Cura_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
-      Cura_AccountManagementService_ClassName);
+    LMI_AccountManagementServiceRef_Set_SystemName(&lamsref, hostname);
+    LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
+      LMI_AccountManagementService_ClassName);
 
     luc = lu_start(NULL, lu_user, NULL, NULL, lu_prompt_console_quiet, NULL, &error);
     if (!luc)
@@ -78,17 +78,17 @@ static CMPIStatus Cura_ServiceAffectsIdentityEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_IdentityRef_Init(&liref, _cb, nameSpace);
+        LMI_IdentityRef_Init(&liref, _cb, nameSpace);
         snprintf(id, 255, ORGID":UID:%ld",
           aux_lu_get_long(lue, LU_UIDNUMBER));
-        Cura_IdentityRef_Set_InstanceID(&liref, id);
+        LMI_IdentityRef_Set_InstanceID(&liref, id);
 
-        Cura_ServiceAffectsIdentity_Init(&lsai, _cb, nameSpace);
-        Cura_ServiceAffectsIdentity_Set_AffectedElement(&lsai, &liref);
-        Cura_ServiceAffectsIdentity_Set_AffectingElement(&lsai, &lamsref);
-        Cura_ServiceAffectsIdentity_Init_ElementEffects(&lsai, 1);
-        Cura_ServiceAffectsIdentity_Set_ElementEffects(&lsai, 0,
-          Cura_ServiceAffectsIdentity_ElementEffects_Manages);
+        LMI_ServiceAffectsIdentity_Init(&lsai, _cb, nameSpace);
+        LMI_ServiceAffectsIdentity_Set_AffectedElement(&lsai, &liref);
+        LMI_ServiceAffectsIdentity_Set_AffectingElement(&lsai, &lamsref);
+        LMI_ServiceAffectsIdentity_Init_ElementEffects(&lsai, 1);
+        LMI_ServiceAffectsIdentity_Set_ElementEffects(&lsai, 0,
+          LMI_ServiceAffectsIdentity_ElementEffects_Manages);
 
         KReturnInstance(cr, lsai);
         lu_ent_free(lue);
@@ -105,17 +105,17 @@ static CMPIStatus Cura_ServiceAffectsIdentityEnumInstances(
       {
         lue = g_ptr_array_index(accounts, i);
 
-        Cura_IdentityRef_Init(&liref, _cb, nameSpace);
+        LMI_IdentityRef_Init(&liref, _cb, nameSpace);
         snprintf(id, 255, ORGID":GID:%ld",
           aux_lu_get_long(lue, LU_GIDNUMBER));
-        Cura_IdentityRef_Set_InstanceID(&liref, id);
+        LMI_IdentityRef_Set_InstanceID(&liref, id);
 
-        Cura_ServiceAffectsIdentity_Init(&lsai, _cb, nameSpace);
-        Cura_ServiceAffectsIdentity_Set_AffectedElement(&lsai, &liref);
-        Cura_ServiceAffectsIdentity_Set_AffectingElement(&lsai, &lamsref);
-        Cura_ServiceAffectsIdentity_Init_ElementEffects(&lsai, 1);
-        Cura_ServiceAffectsIdentity_Set_ElementEffects(&lsai, 0,
-          Cura_ServiceAffectsIdentity_ElementEffects_Manages);
+        LMI_ServiceAffectsIdentity_Init(&lsai, _cb, nameSpace);
+        LMI_ServiceAffectsIdentity_Set_AffectedElement(&lsai, &liref);
+        LMI_ServiceAffectsIdentity_Set_AffectingElement(&lsai, &lamsref);
+        LMI_ServiceAffectsIdentity_Init_ElementEffects(&lsai, 1);
+        LMI_ServiceAffectsIdentity_Set_ElementEffects(&lsai, 0,
+          LMI_ServiceAffectsIdentity_ElementEffects_Manages);
 
         KReturnInstance(cr, lsai);
 
@@ -133,7 +133,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityGetInstance( 
+static CMPIStatus LMI_ServiceAffectsIdentityGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -144,7 +144,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityCreateInstance( 
+static CMPIStatus LMI_ServiceAffectsIdentityCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -154,7 +154,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityModifyInstance( 
+static CMPIStatus LMI_ServiceAffectsIdentityModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -165,7 +165,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityDeleteInstance( 
+static CMPIStatus LMI_ServiceAffectsIdentityDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -174,7 +174,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityExecQuery(
+static CMPIStatus LMI_ServiceAffectsIdentityExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -185,7 +185,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityAssociationCleanup( 
+static CMPIStatus LMI_ServiceAffectsIdentityAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -193,7 +193,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityAssociators(
+static CMPIStatus LMI_ServiceAffectsIdentityAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -210,7 +210,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityAssociators(
         cc,
         cr,
         cop,
-        Cura_ServiceAffectsIdentity_ClassName,
+        LMI_ServiceAffectsIdentity_ClassName,
         assocClass,
         resultClass,
         role,
@@ -218,7 +218,7 @@ static CMPIStatus Cura_ServiceAffectsIdentityAssociators(
         properties);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityAssociatorNames(
+static CMPIStatus LMI_ServiceAffectsIdentityAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -234,14 +234,14 @@ static CMPIStatus Cura_ServiceAffectsIdentityAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_ServiceAffectsIdentity_ClassName,
+        LMI_ServiceAffectsIdentity_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityReferences(
+static CMPIStatus LMI_ServiceAffectsIdentityReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -256,13 +256,13 @@ static CMPIStatus Cura_ServiceAffectsIdentityReferences(
         cc,
         cr,
         cop,
-        Cura_ServiceAffectsIdentity_ClassName,
+        LMI_ServiceAffectsIdentity_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_ServiceAffectsIdentityReferenceNames(
+static CMPIStatus LMI_ServiceAffectsIdentityReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -276,25 +276,25 @@ static CMPIStatus Cura_ServiceAffectsIdentityReferenceNames(
         cc,
         cr,
         cop,
-        Cura_ServiceAffectsIdentity_ClassName,
+        LMI_ServiceAffectsIdentity_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_ServiceAffectsIdentity,
-    Cura_ServiceAffectsIdentity,
+    LMI_ServiceAffectsIdentity,
+    LMI_ServiceAffectsIdentity,
     _cb,
-    Cura_ServiceAffectsIdentityInitialize())
+    LMI_ServiceAffectsIdentityInitialize())
 
 CMAssociationMIStub( 
-    Cura_ServiceAffectsIdentity,
-    Cura_ServiceAffectsIdentity,
+    LMI_ServiceAffectsIdentity,
+    LMI_ServiceAffectsIdentity,
     _cb,
-    Cura_ServiceAffectsIdentityInitialize())
+    LMI_ServiceAffectsIdentityInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_ServiceAffectsIdentity",
-    "Cura_ServiceAffectsIdentity",
+    "LMI_ServiceAffectsIdentity",
+    "LMI_ServiceAffectsIdentity",
     "instance association")
diff --git a/src/account/Cura_SettingsDefineAccountCapabilitiesProvider.c b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c
index a1f1563..008a0d6 100644
--- a/src/account/Cura_SettingsDefineAccountCapabilitiesProvider.c
+++ b/src/account/LMI_SettingsDefineAccountCapabilitiesProvider.c
@@ -1,13 +1,13 @@
 #include <konkret/konkret.h>
-#include "Cura_SettingsDefineAccountCapabilities.h"
+#include "LMI_SettingsDefineAccountCapabilities.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_SettingsDefineAccountCapabilitiesInitialize()
+static void LMI_SettingsDefineAccountCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesCleanup( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -15,7 +15,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesEnumInstanceNames( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -25,7 +25,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesEnumInstances( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -35,7 +35,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesGetInstance( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -46,7 +46,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesCreateInstance( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -56,7 +56,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesModifyInstance( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -67,7 +67,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesDeleteInstance( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -76,7 +76,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesExecQuery(
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -87,7 +87,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociationCleanup( 
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -95,7 +95,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociators(
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -112,7 +112,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociators(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineAccountCapabilities_ClassName,
+        LMI_SettingsDefineAccountCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
@@ -120,7 +120,7 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociators(
         properties);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociatorNames(
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -136,14 +136,14 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineAccountCapabilities_ClassName,
+        LMI_SettingsDefineAccountCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesReferences(
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -158,13 +158,13 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesReferences(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineAccountCapabilities_ClassName,
+        LMI_SettingsDefineAccountCapabilities_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_SettingsDefineAccountCapabilitiesReferenceNames(
+static CMPIStatus LMI_SettingsDefineAccountCapabilitiesReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,25 +178,25 @@ static CMPIStatus Cura_SettingsDefineAccountCapabilitiesReferenceNames(
         cc,
         cr,
         cop,
-        Cura_SettingsDefineAccountCapabilities_ClassName,
+        LMI_SettingsDefineAccountCapabilities_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_SettingsDefineAccountCapabilities,
-    Cura_SettingsDefineAccountCapabilities,
+    LMI_SettingsDefineAccountCapabilities,
+    LMI_SettingsDefineAccountCapabilities,
     _cb,
-    Cura_SettingsDefineAccountCapabilitiesInitialize())
+    LMI_SettingsDefineAccountCapabilitiesInitialize())
 
 CMAssociationMIStub( 
-    Cura_SettingsDefineAccountCapabilities,
-    Cura_SettingsDefineAccountCapabilities,
+    LMI_SettingsDefineAccountCapabilities,
+    LMI_SettingsDefineAccountCapabilities,
     _cb,
-    Cura_SettingsDefineAccountCapabilitiesInitialize())
+    LMI_SettingsDefineAccountCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_SettingsDefineAccountCapabilities",
-    "Cura_SettingsDefineAccountCapabilities",
+    "LMI_SettingsDefineAccountCapabilities",
+    "LMI_SettingsDefineAccountCapabilities",
     "instance association")
diff --git a/src/account/Cura_AccountManagementServiceSettingDataProvider.c b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c
index 5378a8f..3a568c5 100644
--- a/src/account/Cura_AccountManagementServiceSettingDataProvider.c
+++ b/src/account/LMI_SettingsDefineManagementCapabilitiesProvider.c
@@ -1,13 +1,13 @@
 #include <konkret/konkret.h>
-#include "Cura_AccountManagementServiceSettingData.h"
+#include "LMI_SettingsDefineManagementCapabilities.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_AccountManagementServiceSettingDataInitialize()
+static void LMI_SettingsDefineManagementCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataCleanup( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -15,7 +15,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataEnumInstanceNames( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -25,7 +25,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataEnumInstances( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -35,7 +35,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataGetInstance( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -46,7 +46,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataCreateInstance( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -56,7 +56,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataModifyInstance( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -67,7 +67,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataDeleteInstance( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -76,7 +76,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataExecQuery(
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -87,7 +87,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataAssociationCleanup( 
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -95,7 +95,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataAssociators(
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -112,7 +112,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataAssociators(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceSettingData_ClassName,
+        LMI_SettingsDefineManagementCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
@@ -120,7 +120,7 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataAssociatorNames(
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -136,14 +136,14 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceSettingData_ClassName,
+        LMI_SettingsDefineManagementCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataReferences(
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -158,13 +158,13 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataReferences(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceSettingData_ClassName,
+        LMI_SettingsDefineManagementCapabilities_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AccountManagementServiceSettingDataReferenceNames(
+static CMPIStatus LMI_SettingsDefineManagementCapabilitiesReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,25 +178,25 @@ static CMPIStatus Cura_AccountManagementServiceSettingDataReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AccountManagementServiceSettingData_ClassName,
+        LMI_SettingsDefineManagementCapabilities_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AccountManagementServiceSettingData,
-    Cura_AccountManagementServiceSettingData,
+    LMI_SettingsDefineManagementCapabilities,
+    LMI_SettingsDefineManagementCapabilities,
     _cb,
-    Cura_AccountManagementServiceSettingDataInitialize())
+    LMI_SettingsDefineManagementCapabilitiesInitialize())
 
 CMAssociationMIStub( 
-    Cura_AccountManagementServiceSettingData,
-    Cura_AccountManagementServiceSettingData,
+    LMI_SettingsDefineManagementCapabilities,
+    LMI_SettingsDefineManagementCapabilities,
     _cb,
-    Cura_AccountManagementServiceSettingDataInitialize())
+    LMI_SettingsDefineManagementCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AccountManagementServiceSettingData",
-    "Cura_AccountManagementServiceSettingData",
+    "LMI_SettingsDefineManagementCapabilities",
+    "LMI_SettingsDefineManagementCapabilities",
     "instance association")
diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt
index 51671b4..6e9ab97 100644
--- a/src/fan/CMakeLists.txt
+++ b/src/fan/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 set(PROVIDER_NAME Fan)
 set(LIBRARY_NAME cmpiCura_${PROVIDER_NAME})
-set(MOF Cura_Fan.mof)
+set(MOF LMI_Fan.mof)
 
 set(provider_SRCS
     fan.c
-    Cura_FanProvider.c
+    LMI_FanProvider.c
 )
 
 konkretcmpi_generate(${MOF}
diff --git a/src/fan/Cura_FanAssociatedSensorProvider.c b/src/fan/LMI_FanAssociatedSensorProvider.c
index 4674171..d89a1fd 100644
--- a/src/fan/Cura_FanAssociatedSensorProvider.c
+++ b/src/fan/LMI_FanAssociatedSensorProvider.c
@@ -17,18 +17,18 @@
  */
 
 #include <konkret/konkret.h>
-#include "Cura_FanAssociatedSensor.h"
+#include "LMI_FanAssociatedSensor.h"
 #include "fan.h"
 #include <globals.h>
 
 static const CMPIBroker* _cb;
 
-static void Cura_FanAssociatedSensorInitialize()
+static void LMI_FanAssociatedSensorInitialize()
 {
     init_linux_fan_module();
 }
 
-static CMPIStatus Cura_FanAssociatedSensorCleanup(
+static CMPIStatus LMI_FanAssociatedSensorCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -36,7 +36,7 @@ static CMPIStatus Cura_FanAssociatedSensorCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorEnumInstanceNames(
+static CMPIStatus LMI_FanAssociatedSensorEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -46,7 +46,7 @@ static CMPIStatus Cura_FanAssociatedSensorEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorEnumInstances(
+static CMPIStatus LMI_FanAssociatedSensorEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -65,25 +65,25 @@ static CMPIStatus Cura_FanAssociatedSensorEnumInstances(
     // iterate fan list
     while (lptr) {
         sptr = lptr->f;
-        Cura_FanAssociatedSensor w;
-        Cura_FanAssociatedSensor_Init(&w, _cb, ns);
+        LMI_FanAssociatedSensor w;
+        LMI_FanAssociatedSensor_Init(&w, _cb, ns);
 
-        Cura_FanRef fan;
-        Cura_FanRef_Init(&fan, _cb, ns);
-        Cura_FanRef_Set_CreationClassName(&fan, "Cura_Fan");
-        Cura_FanRef_Set_DeviceID(&fan, sptr->device_id);
-        Cura_FanRef_Set_SystemCreationClassName(&fan, get_system_creation_class_name());
-        Cura_FanRef_Set_SystemName(&fan, get_system_name());
+        LMI_FanRef fan;
+        LMI_FanRef_Init(&fan, _cb, ns);
+        LMI_FanRef_Set_CreationClassName(&fan, "LMI_Fan");
+        LMI_FanRef_Set_DeviceID(&fan, sptr->device_id);
+        LMI_FanRef_Set_SystemCreationClassName(&fan, get_system_creation_class_name());
+        LMI_FanRef_Set_SystemName(&fan, get_system_name());
 
-        Cura_FanSensorRef fanSensor;
-        Cura_FanSensorRef_Init(&fanSensor, _cb, ns);
-        Cura_FanSensorRef_Set_CreationClassName(&fanSensor, "Cura_FanSensor");
-        Cura_FanSensorRef_Set_DeviceID(&fanSensor, sptr->device_id);
-        Cura_FanSensorRef_Set_SystemCreationClassName(&fanSensor, get_system_creation_class_name());
-        Cura_FanSensorRef_Set_SystemName(&fanSensor, get_system_name());
+        LMI_FanSensorRef fanSensor;
+        LMI_FanSensorRef_Init(&fanSensor, _cb, ns);
+        LMI_FanSensorRef_Set_CreationClassName(&fanSensor, "LMI_FanSensor");
+        LMI_FanSensorRef_Set_DeviceID(&fanSensor, sptr->device_id);
+        LMI_FanSensorRef_Set_SystemCreationClassName(&fanSensor, get_system_creation_class_name());
+        LMI_FanSensorRef_Set_SystemName(&fanSensor, get_system_name());
 
-        Cura_FanAssociatedSensor_Set_Antecedent(&w, &fanSensor);
-        Cura_FanAssociatedSensor_Set_Dependent(&w, &fan);
+        LMI_FanAssociatedSensor_Set_Antecedent(&w, &fanSensor);
+        LMI_FanAssociatedSensor_Set_Dependent(&w, &fan);
 
         KReturnInstance(cr, w);
         lptr = lptr->next;
@@ -91,7 +91,7 @@ static CMPIStatus Cura_FanAssociatedSensorEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorGetInstance(
+static CMPIStatus LMI_FanAssociatedSensorGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -102,7 +102,7 @@ static CMPIStatus Cura_FanAssociatedSensorGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorCreateInstance(
+static CMPIStatus LMI_FanAssociatedSensorCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -112,7 +112,7 @@ static CMPIStatus Cura_FanAssociatedSensorCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorModifyInstance(
+static CMPIStatus LMI_FanAssociatedSensorModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -123,7 +123,7 @@ static CMPIStatus Cura_FanAssociatedSensorModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorDeleteInstance(
+static CMPIStatus LMI_FanAssociatedSensorDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -132,7 +132,7 @@ static CMPIStatus Cura_FanAssociatedSensorDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorExecQuery(
+static CMPIStatus LMI_FanAssociatedSensorExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -143,7 +143,7 @@ static CMPIStatus Cura_FanAssociatedSensorExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorAssociationCleanup(
+static CMPIStatus LMI_FanAssociatedSensorAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -151,7 +151,7 @@ static CMPIStatus Cura_FanAssociatedSensorAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorAssociators(
+static CMPIStatus LMI_FanAssociatedSensorAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -168,7 +168,7 @@ static CMPIStatus Cura_FanAssociatedSensorAssociators(
         cc,
         cr,
         cop,
-        Cura_FanAssociatedSensor_ClassName,
+        LMI_FanAssociatedSensor_ClassName,
         assocClass,
         resultClass,
         role,
@@ -176,7 +176,7 @@ static CMPIStatus Cura_FanAssociatedSensorAssociators(
         properties);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorAssociatorNames(
+static CMPIStatus LMI_FanAssociatedSensorAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -192,14 +192,14 @@ static CMPIStatus Cura_FanAssociatedSensorAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_FanAssociatedSensor_ClassName,
+        LMI_FanAssociatedSensor_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorReferences(
+static CMPIStatus LMI_FanAssociatedSensorReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -214,13 +214,13 @@ static CMPIStatus Cura_FanAssociatedSensorReferences(
         cc,
         cr,
         cop,
-        Cura_FanAssociatedSensor_ClassName,
+        LMI_FanAssociatedSensor_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_FanAssociatedSensorReferenceNames(
+static CMPIStatus LMI_FanAssociatedSensorReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -234,25 +234,25 @@ static CMPIStatus Cura_FanAssociatedSensorReferenceNames(
         cc,
         cr,
         cop,
-        Cura_FanAssociatedSensor_ClassName,
+        LMI_FanAssociatedSensor_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_FanAssociatedSensor,
-    Cura_FanAssociatedSensor,
+    LMI_FanAssociatedSensor,
+    LMI_FanAssociatedSensor,
     _cb,
-    Cura_FanAssociatedSensorInitialize())
+    LMI_FanAssociatedSensorInitialize())
 
 CMAssociationMIStub( 
-    Cura_FanAssociatedSensor,
-    Cura_FanAssociatedSensor,
+    LMI_FanAssociatedSensor,
+    LMI_FanAssociatedSensor,
     _cb,
-    Cura_FanAssociatedSensorInitialize())
+    LMI_FanAssociatedSensorInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_FanAssociatedSensor",
-    "Cura_FanAssociatedSensor",
+    "LMI_FanAssociatedSensor",
+    "LMI_FanAssociatedSensor",
     "instance association")
diff --git a/src/fan/Cura_FanProvider.c b/src/fan/LMI_FanProvider.c
index cc9e13c..e6d8959 100644
--- a/src/fan/Cura_FanProvider.c
+++ b/src/fan/LMI_FanProvider.c
@@ -18,7 +18,7 @@
 
 #include <konkret/konkret.h>
 #include <stdint.h>
-#include "Cura_Fan.h"
+#include "LMI_Fan.h"
 #include "globals.h"
 #include "fan.h"
 static const CMPIBroker* _cb = NULL;
@@ -44,13 +44,13 @@ void print_backtrace(int signal)
     }
 }
 
-static void Cura_FanInitialize()
+static void LMI_FanInitialize()
 {
     init_linux_fan_module();
     signal(SIGSEGV, print_backtrace);
 }
 
-static CMPIStatus Cura_FanCleanup(
+static CMPIStatus LMI_FanCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -58,7 +58,7 @@ static CMPIStatus Cura_FanCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanEnumInstanceNames(
+static CMPIStatus LMI_FanEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -68,7 +68,7 @@ static CMPIStatus Cura_FanEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_FanEnumInstances(
+static CMPIStatus LMI_FanEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -90,30 +90,30 @@ static CMPIStatus Cura_FanEnumInstances(
     lptr = fans;
     while (lptr != NULL) {
         sptr = lptr->f;
-        Cura_Fan w;
-        Cura_Fan_Init(&w, _cb, ns);
-        Cura_Fan_Set_CreationClassName(&w, "Cura_Fan");
-        Cura_Fan_Set_SystemCreationClassName(&w, get_system_creation_class_name());
-        Cura_Fan_Set_SystemName(&w, get_system_name());
-        Cura_Fan_Set_DeviceID(&w, sptr->device_id);
-
-        Cura_Fan_Set_Caption(&w, "Computer's fan");
-        Cura_Fan_Set_Description(&w,"Computer's fan.");
+        LMI_Fan w;
+        LMI_Fan_Init(&w, _cb, ns);
+        LMI_Fan_Set_CreationClassName(&w, "LMI_Fan");
+        LMI_Fan_Set_SystemCreationClassName(&w, get_system_creation_class_name());
+        LMI_Fan_Set_SystemName(&w, get_system_name());
+        LMI_Fan_Set_DeviceID(&w, sptr->device_id);
+
+        LMI_Fan_Set_Caption(&w, "Computer's fan");
+        LMI_Fan_Set_Description(&w,"Computer's fan.");
         snprintf(buf, 200, "Fan \"%s\" on chip \"%s\"", sptr->name, sptr->chip_name);
-        Cura_Fan_Set_ElementName(&w, buf);
+        LMI_Fan_Set_ElementName(&w, buf);
 
         // ManagedSystemElement
-        Cura_Fan_Set_Name(&w, sptr->name);
-        Cura_Fan_Init_OperationalStatus(&w, 2);
-        Cura_Fan_Set_OperationalStatus(&w, 0, sptr->fault ?
-                Cura_Fan_OperationalStatus_Error :
-                Cura_Fan_OperationalStatus_OK);
+        LMI_Fan_Set_Name(&w, sptr->name);
+        LMI_Fan_Init_OperationalStatus(&w, 2);
+        LMI_Fan_Set_OperationalStatus(&w, 0, sptr->fault ?
+                LMI_Fan_OperationalStatus_Error :
+                LMI_Fan_OperationalStatus_OK);
         if (sptr->alarm || sptr->alarm_min || sptr->alarm_max) {
-            Cura_Fan_Set_OperationalStatus(&w, 1, Cura_Fan_OperationalStatus_Stressed);
+            LMI_Fan_Set_OperationalStatus(&w, 1, LMI_Fan_OperationalStatus_Stressed);
         }
 
-        Cura_Fan_Init_StatusDescriptions(&w, 2);
-        Cura_Fan_Set_StatusDescriptions(&w, 0, sptr->fault ?
+        LMI_Fan_Init_StatusDescriptions(&w, 2);
+        LMI_Fan_Set_StatusDescriptions(&w, 0, sptr->fault ?
                 "Chip indicates, that fan is in fault state."
                 " Possible causes are open diodes, unconnected fan etc."
                 " Thus the measurement for this channel should not be trusted."
@@ -124,66 +124,66 @@ static CMPIStatus Cura_FanEnumInstances(
                      sptr->alarm ? "1":"0",
                      sptr->alarm_min ? "1":"0",
                      sptr->alarm_max ? "1":"0");
-            Cura_Fan_Set_StatusDescriptions(&w, 1, buf);
+            LMI_Fan_Set_StatusDescriptions(&w, 1, buf);
         }
 
 
-        Cura_Fan_Set_HealthState(&w, sptr->fault ?
-                Cura_Fan_HealthState_Major_failure :
-                Cura_Fan_HealthState_OK);
+        LMI_Fan_Set_HealthState(&w, sptr->fault ?
+                LMI_Fan_HealthState_Major_failure :
+                LMI_Fan_HealthState_OK);
 
-        Cura_Fan_Set_OperatingStatus(&w, sptr->fault ?
-                Cura_Fan_OperatingStatus_Stopped :
-                Cura_Fan_OperatingStatus_In_Service);
+        LMI_Fan_Set_OperatingStatus(&w, sptr->fault ?
+                LMI_Fan_OperatingStatus_Stopped :
+                LMI_Fan_OperatingStatus_In_Service);
 
-        Cura_Fan_Set_PrimaryStatus(&w, sptr->fault ?
-                Cura_Fan_PrimaryStatus_Error :
-                Cura_Fan_PrimaryStatus_OK);
+        LMI_Fan_Set_PrimaryStatus(&w, sptr->fault ?
+                LMI_Fan_PrimaryStatus_Error :
+                LMI_Fan_PrimaryStatus_OK);
 
         // EnabledLogicalElement
-        Cura_Fan_Init_OtherIdentifyingInfo(&w, 2);
-        Cura_Fan_Set_OtherIdentifyingInfo(&w, 0, sptr->chip_name);
-        Cura_Fan_Set_OtherIdentifyingInfo(&w, 1, sptr->sys_path);
+        LMI_Fan_Init_OtherIdentifyingInfo(&w, 2);
+        LMI_Fan_Set_OtherIdentifyingInfo(&w, 0, sptr->chip_name);
+        LMI_Fan_Set_OtherIdentifyingInfo(&w, 1, sptr->sys_path);
 
-        Cura_Fan_Init_IdentifyingDescriptions(&w, 2);
-        Cura_Fan_Set_IdentifyingDescriptions(&w, 0, "ChipName - name of fan's chip.");
-        Cura_Fan_Set_IdentifyingDescriptions(&w, 1, "SysPath - system path of fan's chip.");
+        LMI_Fan_Init_IdentifyingDescriptions(&w, 2);
+        LMI_Fan_Set_IdentifyingDescriptions(&w, 0, "ChipName - name of fan's chip.");
+        LMI_Fan_Set_IdentifyingDescriptions(&w, 1, "SysPath - system path of fan's chip.");
 
-        Cura_Fan_Set_ActiveCooling(&w, true);
+        LMI_Fan_Set_ActiveCooling(&w, true);
 
         uint32_t i = 1;
         int index = 0;
         debug("accessible_features: %d", sptr->accessible_features);
-        Cura_Fan_Init_AccessibleFeatures(&w, 8);
+        LMI_Fan_Init_AccessibleFeatures(&w, 8);
         while (i <= CIM_FAN_AF_FEATURE_MAX) {
             if (i & sptr->accessible_features) {
-                Cura_Fan_Set_AccessibleFeatures(&w, index++, i);
+                LMI_Fan_Set_AccessibleFeatures(&w, index++, i);
             }
             i = i << 1;
         }
         if (sptr->accessible_features & CIM_FAN_AF_MIN_SPEED) {
-            Cura_Fan_Set_MinSpeed(&w, (uint64_t) sptr->min_speed);
+            LMI_Fan_Set_MinSpeed(&w, (uint64_t) sptr->min_speed);
         }
         if (sptr->accessible_features & CIM_FAN_AF_MAX_SPEED) {
-            Cura_Fan_Set_MaxSpeed(&w, (uint64_t) sptr->max_speed);
+            LMI_Fan_Set_MaxSpeed(&w, (uint64_t) sptr->max_speed);
         }
         if (sptr->accessible_features & CIM_FAN_AF_DIV) {
-            Cura_Fan_Set_Divisor(&w, sptr->divisor);
+            LMI_Fan_Set_Divisor(&w, sptr->divisor);
         }
         if (sptr->accessible_features & CIM_FAN_AF_PULSES) {
-            Cura_Fan_Set_Pulses(&w, sptr->pulses);
+            LMI_Fan_Set_Pulses(&w, sptr->pulses);
         }
         if (sptr->accessible_features & CIM_FAN_AF_BEEP) {
-            Cura_Fan_Set_Beep(&w, sptr->beep);
+            LMI_Fan_Set_Beep(&w, sptr->beep);
         }
         if (sptr->accessible_features & CIM_FAN_AF_ALARM) {
-            Cura_Fan_Set_Alarm(&w, sptr->alarm);
+            LMI_Fan_Set_Alarm(&w, sptr->alarm);
         }
         if (sptr->accessible_features & CIM_FAN_AF_ALARM_MIN) {
-            Cura_Fan_Set_MinAlarm(&w, sptr->alarm_min);
+            LMI_Fan_Set_MinAlarm(&w, sptr->alarm_min);
         }
         if (sptr->accessible_features & CIM_FAN_AF_ALARM_MAX) {
-            Cura_Fan_Set_MaxAlarm(&w, sptr->alarm_max);
+            LMI_Fan_Set_MaxAlarm(&w, sptr->alarm_max);
         }
 
         KReturnInstance(cr, w);
@@ -193,7 +193,7 @@ static CMPIStatus Cura_FanEnumInstances(
     KReturn(OK);
 }
 
-static CMPIStatus Cura_FanGetInstance(
+static CMPIStatus LMI_FanGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -204,7 +204,7 @@ static CMPIStatus Cura_FanGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_FanCreateInstance(
+static CMPIStatus LMI_FanCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -214,7 +214,7 @@ static CMPIStatus Cura_FanCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanModifyInstance(
+static CMPIStatus LMI_FanModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -225,7 +225,7 @@ static CMPIStatus Cura_FanModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanDeleteInstance(
+static CMPIStatus LMI_FanDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -234,7 +234,7 @@ static CMPIStatus Cura_FanDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanExecQuery(
+static CMPIStatus LMI_FanExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -246,12 +246,12 @@ static CMPIStatus Cura_FanExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_Fan,
-    Cura_Fan,
+    LMI_Fan,
+    LMI_Fan,
     _cb,
-    Cura_FanInitialize())
+    LMI_FanInitialize())
 
-static CMPIStatus Cura_FanMethodCleanup(
+static CMPIStatus LMI_FanMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -259,7 +259,7 @@ static CMPIStatus Cura_FanMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanInvokeMethod(
+static CMPIStatus LMI_FanInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -268,21 +268,21 @@ static CMPIStatus Cura_FanInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_Fan_DispatchMethod(
+    return LMI_Fan_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_Fan,
-    Cura_Fan,
+    LMI_Fan,
+    LMI_Fan,
     _cb,
-    Cura_FanInitialize())
+    LMI_FanInitialize())
 
-KUint32 Cura_Fan_RequestStateChange(
+KUint32 LMI_Fan_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -294,11 +294,11 @@ KUint32 Cura_Fan_RequestStateChange(
     return result;
 }
 
-KUint32 Cura_Fan_SetPowerState(
+KUint32 LMI_Fan_SetPowerState(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KUint16* PowerState,
     const KDateTime* Time,
     CMPIStatus* status)
@@ -309,11 +309,11 @@ KUint32 Cura_Fan_SetPowerState(
     return result;
 }
 
-KUint32 Cura_Fan_Reset(
+KUint32 LMI_Fan_Reset(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -322,11 +322,11 @@ KUint32 Cura_Fan_Reset(
     return result;
 }
 
-KUint32 Cura_Fan_EnableDevice(
+KUint32 LMI_Fan_EnableDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KBoolean* Enabled,
     CMPIStatus* status)
 {
@@ -336,11 +336,11 @@ KUint32 Cura_Fan_EnableDevice(
     return result;
 }
 
-KUint32 Cura_Fan_OnlineDevice(
+KUint32 LMI_Fan_OnlineDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KBoolean* Online,
     CMPIStatus* status)
 {
@@ -350,11 +350,11 @@ KUint32 Cura_Fan_OnlineDevice(
     return result;
 }
 
-KUint32 Cura_Fan_QuiesceDevice(
+KUint32 LMI_Fan_QuiesceDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KBoolean* Quiesce,
     CMPIStatus* status)
 {
@@ -364,11 +364,11 @@ KUint32 Cura_Fan_QuiesceDevice(
     return result;
 }
 
-KUint32 Cura_Fan_SaveProperties(
+KUint32 LMI_Fan_SaveProperties(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -377,11 +377,11 @@ KUint32 Cura_Fan_SaveProperties(
     return result;
 }
 
-KUint32 Cura_Fan_RestoreProperties(
+KUint32 LMI_Fan_RestoreProperties(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -390,11 +390,11 @@ KUint32 Cura_Fan_RestoreProperties(
     return result;
 }
 
-KUint32 Cura_Fan_SetSpeed(
+KUint32 LMI_Fan_SetSpeed(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanRef* self,
+    const LMI_FanRef* self,
     const KUint64* DesiredSpeed,
     CMPIStatus* status)
 {
@@ -406,6 +406,6 @@ KUint32 Cura_Fan_SetSpeed(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_Fan",
-    "Cura_Fan",
+    "LMI_Fan",
+    "LMI_Fan",
     "instance method")
diff --git a/src/fan/Cura_FanSensorProvider.c b/src/fan/LMI_FanSensorProvider.c
index 2965bf5..5ede6fb 100644
--- a/src/fan/Cura_FanSensorProvider.c
+++ b/src/fan/LMI_FanSensorProvider.c
@@ -17,18 +17,18 @@
  */
 
 #include <konkret/konkret.h>
-#include "Cura_FanSensor.h"
+#include "LMI_FanSensor.h"
 #include "fan.h"
 #include <globals.h>
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_FanSensorInitialize()
+static void LMI_FanSensorInitialize()
 {
     init_linux_fan_module();
 }
 
-static CMPIStatus Cura_FanSensorCleanup(
+static CMPIStatus LMI_FanSensorCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -36,7 +36,7 @@ static CMPIStatus Cura_FanSensorCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanSensorEnumInstanceNames(
+static CMPIStatus LMI_FanSensorEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -46,7 +46,7 @@ static CMPIStatus Cura_FanSensorEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_FanSensorEnumInstances(
+static CMPIStatus LMI_FanSensorEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -64,31 +64,31 @@ static CMPIStatus Cura_FanSensorEnumInstances(
     // iterate fan list
     while (lptr) {
         sptr = lptr->f;
-        Cura_FanSensor w;
-        Cura_FanSensor_Init(&w, _cb, KNameSpace(cop));
-        Cura_FanSensor_Set_CreationClassName(&w, "Cura_FanSensor");
-        Cura_FanSensor_Set_SystemCreationClassName(&w, get_system_creation_class_name());
-        Cura_FanSensor_Set_SystemName(&w, get_system_name());
-        Cura_FanSensor_Set_DeviceID(&w, sptr->device_id);
-
-        Cura_FanSensor_Set_Caption(&w, "Computer's fan");
-        Cura_FanSensor_Set_Description(&w,"Computer's fan.");
+        LMI_FanSensor w;
+        LMI_FanSensor_Init(&w, _cb, KNameSpace(cop));
+        LMI_FanSensor_Set_CreationClassName(&w, "LMI_FanSensor");
+        LMI_FanSensor_Set_SystemCreationClassName(&w, get_system_creation_class_name());
+        LMI_FanSensor_Set_SystemName(&w, get_system_name());
+        LMI_FanSensor_Set_DeviceID(&w, sptr->device_id);
+
+        LMI_FanSensor_Set_Caption(&w, "Computer's fan");
+        LMI_FanSensor_Set_Description(&w,"Computer's fan.");
         snprintf(buf, 200, "Fan \"%s\" on chip \"%s\"", sptr->name, sptr->chip_name);
-        Cura_FanSensor_Set_ElementName(&w, buf);
+        LMI_FanSensor_Set_ElementName(&w, buf);
 
         // ManagedSystemElement
-        Cura_FanSensor_Set_Name(&w, sptr->name);
+        LMI_FanSensor_Set_Name(&w, sptr->name);
 
-        Cura_FanSensor_Init_OperationalStatus(&w, 2);
-        Cura_FanSensor_Set_OperationalStatus(&w, 0, sptr->fault ?
-                Cura_FanSensor_OperationalStatus_Error :
-                Cura_FanSensor_OperationalStatus_OK);
+        LMI_FanSensor_Init_OperationalStatus(&w, 2);
+        LMI_FanSensor_Set_OperationalStatus(&w, 0, sptr->fault ?
+                LMI_FanSensor_OperationalStatus_Error :
+                LMI_FanSensor_OperationalStatus_OK);
         if (sptr->alarm || sptr->alarm_min || sptr->alarm_max) {
-            Cura_FanSensor_Set_OperationalStatus(&w, 1, Cura_FanSensor_OperationalStatus_Stressed);
+            LMI_FanSensor_Set_OperationalStatus(&w, 1, LMI_FanSensor_OperationalStatus_Stressed);
         }
 
-        Cura_FanSensor_Init_StatusDescriptions(&w, 2);
-        Cura_FanSensor_Set_StatusDescriptions(&w, 0, sptr->fault ?
+        LMI_FanSensor_Init_StatusDescriptions(&w, 2);
+        LMI_FanSensor_Set_StatusDescriptions(&w, 0, sptr->fault ?
                 "Chip indicates, that fan is in fault state."
                 " Possible causes are open diodes, unconnected fan etc."
                 " Thus the measurement for this channel should not be trusted."
@@ -99,66 +99,66 @@ static CMPIStatus Cura_FanSensorEnumInstances(
                      sptr->alarm ? "1":"0",
                      sptr->alarm_min ? "1":"0",
                      sptr->alarm_max ? "1":"0");
-            Cura_FanSensor_Set_StatusDescriptions(&w, 1, buf);
+            LMI_FanSensor_Set_StatusDescriptions(&w, 1, buf);
         }
 
-        Cura_FanSensor_Set_HealthState(&w, sptr->fault ?
-                Cura_FanSensor_HealthState_Major_failure :
-                Cura_FanSensor_HealthState_OK);
+        LMI_FanSensor_Set_HealthState(&w, sptr->fault ?
+                LMI_FanSensor_HealthState_Major_failure :
+                LMI_FanSensor_HealthState_OK);
 
-        Cura_FanSensor_Set_OperatingStatus(&w, sptr->fault ?
-                Cura_FanSensor_OperatingStatus_Stopped :
-                Cura_FanSensor_OperatingStatus_In_Service);
+        LMI_FanSensor_Set_OperatingStatus(&w, sptr->fault ?
+                LMI_FanSensor_OperatingStatus_Stopped :
+                LMI_FanSensor_OperatingStatus_In_Service);
 
-        Cura_FanSensor_Set_PrimaryStatus(&w, sptr->fault ?
-                Cura_FanSensor_PrimaryStatus_Error :
-                Cura_FanSensor_PrimaryStatus_OK);
+        LMI_FanSensor_Set_PrimaryStatus(&w, sptr->fault ?
+                LMI_FanSensor_PrimaryStatus_Error :
+                LMI_FanSensor_PrimaryStatus_OK);
 
         // EnabledLogicalElement
-        Cura_FanSensor_Init_OtherIdentifyingInfo(&w, 2);
-        Cura_FanSensor_Set_OtherIdentifyingInfo(&w, 0, sptr->chip_name);
-        Cura_FanSensor_Set_OtherIdentifyingInfo(&w, 1, sptr->sys_path);
+        LMI_FanSensor_Init_OtherIdentifyingInfo(&w, 2);
+        LMI_FanSensor_Set_OtherIdentifyingInfo(&w, 0, sptr->chip_name);
+        LMI_FanSensor_Set_OtherIdentifyingInfo(&w, 1, sptr->sys_path);
 
-        Cura_FanSensor_Init_IdentifyingDescriptions(&w, 2);
-        Cura_FanSensor_Set_IdentifyingDescriptions(&w, 0, "ChipName - name of fan's chip.");
-        Cura_FanSensor_Set_IdentifyingDescriptions(&w, 1, "SysPath - system path of fan's chip.");
+        LMI_FanSensor_Init_IdentifyingDescriptions(&w, 2);
+        LMI_FanSensor_Set_IdentifyingDescriptions(&w, 0, "ChipName - name of fan's chip.");
+        LMI_FanSensor_Set_IdentifyingDescriptions(&w, 1, "SysPath - system path of fan's chip.");
 
         // ManagedElement
-        Cura_FanSensor_Set_Caption(&w, "Fan's tachometer");
-        Cura_FanSensor_Set_Description(&w,"Associated sensor of fan. Giving information about its speed.");
+        LMI_FanSensor_Set_Caption(&w, "Fan's tachometer");
+        LMI_FanSensor_Set_Description(&w,"Associated sensor of fan. Giving information about its speed.");
 
         snprintf(buf, 200, "Tachometer of fan \"%s\" on chip \"%s\"", sptr->name, sptr->chip_name);
-        Cura_FanSensor_Set_ElementName(&w, buf);
+        LMI_FanSensor_Set_ElementName(&w, buf);
 
         // Sensor
-        Cura_FanSensor_Set_SensorType(&w, Cura_FanSensor_SensorType_Tachometer);
-        Cura_FanSensor_Set_CurrentState(&w, fan_get_current_state(sptr));
+        LMI_FanSensor_Set_SensorType(&w, LMI_FanSensor_SensorType_Tachometer);
+        LMI_FanSensor_Set_CurrentState(&w, fan_get_current_state(sptr));
 
-        Cura_FanSensor_Init_PossibleStates(&w, 5);
+        LMI_FanSensor_Init_PossibleStates(&w, 5);
         int index = 0;
         if (sptr->accessible_features & CIM_FAN_AF_MIN_SPEED) {
-            Cura_FanSensor_Set_PossibleStates(&w, index++, "Below Minimum");
-            Cura_FanSensor_Set_PossibleStates(&w, index++, "At Minimum");
+            LMI_FanSensor_Set_PossibleStates(&w, index++, "Below Minimum");
+            LMI_FanSensor_Set_PossibleStates(&w, index++, "At Minimum");
         }
-        Cura_FanSensor_Set_PossibleStates(&w, index++, "Normal");
+        LMI_FanSensor_Set_PossibleStates(&w, index++, "Normal");
         if (sptr->accessible_features & CIM_FAN_AF_MAX_SPEED) {
-            Cura_FanSensor_Set_PossibleStates(&w, index++, "At Maximum");
-            Cura_FanSensor_Set_PossibleStates(&w, index++, "Above Maximum");
+            LMI_FanSensor_Set_PossibleStates(&w, index++, "At Maximum");
+            LMI_FanSensor_Set_PossibleStates(&w, index++, "Above Maximum");
         }
 
         // NumericSensor
-        Cura_FanSensor_Set_BaseUnits(&w, Cura_FanSensor_BaseUnits_Revolutions);
-        Cura_FanSensor_Set_UnitModifier(&w, 0);
-        Cura_FanSensor_Set_RateUnits(&w, Cura_FanSensor_RateUnits_Per_Minute);
-        Cura_FanSensor_Set_CurrentReading(&w, sptr->speed);
+        LMI_FanSensor_Set_BaseUnits(&w, LMI_FanSensor_BaseUnits_Revolutions);
+        LMI_FanSensor_Set_UnitModifier(&w, 0);
+        LMI_FanSensor_Set_RateUnits(&w, LMI_FanSensor_RateUnits_Per_Minute);
+        LMI_FanSensor_Set_CurrentReading(&w, sptr->speed);
         if (sptr->accessible_features & CIM_FAN_AF_MAX_SPEED) {
-            Cura_FanSensor_Set_NormalMax(&w, sptr->max_speed);
+            LMI_FanSensor_Set_NormalMax(&w, sptr->max_speed);
         }
         if (sptr->accessible_features & CIM_FAN_AF_MIN_SPEED) {
-            Cura_FanSensor_Set_NormalMin(&w, sptr->min_speed);
+            LMI_FanSensor_Set_NormalMin(&w, sptr->min_speed);
         }
-        Cura_FanSensor_Set_MinReadable(&w, 0);
-        Cura_FanSensor_Set_IsLinear(&w, true);
+        LMI_FanSensor_Set_MinReadable(&w, 0);
+        LMI_FanSensor_Set_IsLinear(&w, true);
 
         KReturnInstance(cr, w);
         lptr = lptr->next;
@@ -166,7 +166,7 @@ static CMPIStatus Cura_FanSensorEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanSensorGetInstance(
+static CMPIStatus LMI_FanSensorGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -177,7 +177,7 @@ static CMPIStatus Cura_FanSensorGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_FanSensorCreateInstance(
+static CMPIStatus LMI_FanSensorCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -187,7 +187,7 @@ static CMPIStatus Cura_FanSensorCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanSensorModifyInstance(
+static CMPIStatus LMI_FanSensorModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -198,7 +198,7 @@ static CMPIStatus Cura_FanSensorModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanSensorDeleteInstance(
+static CMPIStatus LMI_FanSensorDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -207,7 +207,7 @@ static CMPIStatus Cura_FanSensorDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_FanSensorExecQuery(
+static CMPIStatus LMI_FanSensorExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -219,12 +219,12 @@ static CMPIStatus Cura_FanSensorExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_FanSensor,
-    Cura_FanSensor,
+    LMI_FanSensor,
+    LMI_FanSensor,
     _cb,
-    Cura_FanSensorInitialize())
+    LMI_FanSensorInitialize())
 
-static CMPIStatus Cura_FanSensorMethodCleanup(
+static CMPIStatus LMI_FanSensorMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -232,7 +232,7 @@ static CMPIStatus Cura_FanSensorMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_FanSensorInvokeMethod(
+static CMPIStatus LMI_FanSensorInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -241,21 +241,21 @@ static CMPIStatus Cura_FanSensorInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_FanSensor_DispatchMethod(
+    return LMI_FanSensor_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_FanSensor,
-    Cura_FanSensor,
+    LMI_FanSensor,
+    LMI_FanSensor,
     _cb,
-    Cura_FanSensorInitialize())
+    LMI_FanSensorInitialize())
 
-KUint32 Cura_FanSensor_RequestStateChange(
+KUint32 LMI_FanSensor_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -267,11 +267,11 @@ KUint32 Cura_FanSensor_RequestStateChange(
     return result;
 }
 
-KUint32 Cura_FanSensor_SetPowerState(
+KUint32 LMI_FanSensor_SetPowerState(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KUint16* PowerState,
     const KDateTime* Time,
     CMPIStatus* status)
@@ -282,11 +282,11 @@ KUint32 Cura_FanSensor_SetPowerState(
     return result;
 }
 
-KUint32 Cura_FanSensor_Reset(
+KUint32 LMI_FanSensor_Reset(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -295,11 +295,11 @@ KUint32 Cura_FanSensor_Reset(
     return result;
 }
 
-KUint32 Cura_FanSensor_EnableDevice(
+KUint32 LMI_FanSensor_EnableDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KBoolean* Enabled,
     CMPIStatus* status)
 {
@@ -309,11 +309,11 @@ KUint32 Cura_FanSensor_EnableDevice(
     return result;
 }
 
-KUint32 Cura_FanSensor_OnlineDevice(
+KUint32 LMI_FanSensor_OnlineDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KBoolean* Online,
     CMPIStatus* status)
 {
@@ -323,11 +323,11 @@ KUint32 Cura_FanSensor_OnlineDevice(
     return result;
 }
 
-KUint32 Cura_FanSensor_QuiesceDevice(
+KUint32 LMI_FanSensor_QuiesceDevice(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KBoolean* Quiesce,
     CMPIStatus* status)
 {
@@ -337,11 +337,11 @@ KUint32 Cura_FanSensor_QuiesceDevice(
     return result;
 }
 
-KUint32 Cura_FanSensor_SaveProperties(
+KUint32 LMI_FanSensor_SaveProperties(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -350,11 +350,11 @@ KUint32 Cura_FanSensor_SaveProperties(
     return result;
 }
 
-KUint32 Cura_FanSensor_RestoreProperties(
+KUint32 LMI_FanSensor_RestoreProperties(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -363,11 +363,11 @@ KUint32 Cura_FanSensor_RestoreProperties(
     return result;
 }
 
-KUint32 Cura_FanSensor_RestoreDefaultThresholds(
+KUint32 LMI_FanSensor_RestoreDefaultThresholds(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -376,11 +376,11 @@ KUint32 Cura_FanSensor_RestoreDefaultThresholds(
     return result;
 }
 
-KUint32 Cura_FanSensor_GetNonLinearFactors(
+KUint32 LMI_FanSensor_GetNonLinearFactors(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_FanSensorRef* self,
+    const LMI_FanSensorRef* self,
     const KSint32* SensorReading,
     KSint32* Accuracy,
     KUint32* Resolution,
@@ -396,6 +396,6 @@ KUint32 Cura_FanSensor_GetNonLinearFactors(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_FanSensor",
-    "Cura_FanSensor",
+    "LMI_FanSensor",
+    "LMI_FanSensor",
     "instance method")
diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt
index 592380d..a577af9 100644
--- a/src/power/CMakeLists.txt
+++ b/src/power/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME PowerManagement)
 set(LIBRARY_NAME cmpiCura_${PROVIDER_NAME})
-set(MOF Cura_PowerManagement.mof)
+set(MOF LMI_PowerManagement.mof)
 
 set(provider_SRCS
     power.c
diff --git a/src/power/Cura_AssociatedPowerManagementServiceProvider.c b/src/power/LMI_AssociatedPowerManagementServiceProvider.c
index 81f8883..777f736 100644
--- a/src/power/Cura_AssociatedPowerManagementServiceProvider.c
+++ b/src/power/LMI_AssociatedPowerManagementServiceProvider.c
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Cura_AssociatedPowerManagementService.h"
-#include "Cura_PowerManagementService.h"
+#include "LMI_AssociatedPowerManagementService.h"
+#include "LMI_PowerManagementService.h"
 #include "CIM_ComputerSystem.h"
 
 #include "power.h"
@@ -25,17 +25,17 @@
 
 static const CMPIBroker* _cb;
 
-static void Cura_AssociatedPowerManagementServiceInitialize(CMPIInstanceMI *mi)
+static void LMI_AssociatedPowerManagementServiceInitialize(CMPIInstanceMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static void Cura_AssociatedPowerManagementServiceAssociationInitialize(CMPIAssociationMI *mi)
+static void LMI_AssociatedPowerManagementServiceAssociationInitialize(CMPIAssociationMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceCleanup(
+static CMPIStatus LMI_AssociatedPowerManagementServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -45,7 +45,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceEnumInstanceNames(
+static CMPIStatus LMI_AssociatedPowerManagementServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -55,7 +55,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceEnumInstances(
+static CMPIStatus LMI_AssociatedPowerManagementServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -65,8 +65,8 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceEnumInstances(
     CMPIStatus rc;
     const char *ns = KNameSpace(cop);
 
-    Cura_AssociatedPowerManagementService w;
-    Cura_AssociatedPowerManagementService_Init(&w, _cb, ns);
+    LMI_AssociatedPowerManagementService w;
+    LMI_AssociatedPowerManagementService_Init(&w, _cb, ns);
 
     CIM_ComputerSystemRef computerSystemRef;
     CIM_ComputerSystemRef_Init(&computerSystemRef, _cb, ns);
@@ -74,32 +74,32 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceEnumInstances(
     CIM_ComputerSystemRef_Set_CreationClassName(&computerSystemRef, get_system_creation_class_name());
     CMPIObjectPath *computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&computerSystemRef, &rc);
     computerSystemOP->ft->setClassName(computerSystemOP, get_system_creation_class_name());
-    Cura_AssociatedPowerManagementService_SetObjectPath_UserOfService(&w, computerSystemOP);
+    LMI_AssociatedPowerManagementService_SetObjectPath_UserOfService(&w, computerSystemOP);
 
-    Cura_PowerManagementServiceRef powerManagementServiceRef;
-    Cura_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
-    Cura_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Cura_PowerManagementService");
-    Cura_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
-    Cura_AssociatedPowerManagementService_Set_ServiceProvided(&w, &powerManagementServiceRef);
+    LMI_PowerManagementServiceRef powerManagementServiceRef;
+    LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
+    LMI_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "LMI_PowerManagementService");
+    LMI_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
+    LMI_AssociatedPowerManagementService_Set_ServiceProvided(&w, &powerManagementServiceRef);
 
     int count;
     unsigned short *list = power_available_requested_power_states(mi->hdl, &count);
-    Cura_AssociatedPowerManagementService_Init_AvailableRequestedPowerStates(&w, count);
+    LMI_AssociatedPowerManagementService_Init_AvailableRequestedPowerStates(&w, count);
     for (int i = 0; i < count; i++) {
-        Cura_AssociatedPowerManagementService_Set_AvailableRequestedPowerStates(&w, i, list[i]);
+        LMI_AssociatedPowerManagementService_Set_AvailableRequestedPowerStates(&w, i, list[i]);
     }
 
-    Cura_AssociatedPowerManagementService_Set_TransitioningToPowerState(&w, power_transitioning_to_power_state(mi->hdl));
-    Cura_AssociatedPowerManagementService_Set_PowerState(&w, 2);
-    Cura_AssociatedPowerManagementService_Set_RequestedPowerState(&w, power_requested_power_state(mi->hdl));
+    LMI_AssociatedPowerManagementService_Set_TransitioningToPowerState(&w, power_transitioning_to_power_state(mi->hdl));
+    LMI_AssociatedPowerManagementService_Set_PowerState(&w, 2);
+    LMI_AssociatedPowerManagementService_Set_RequestedPowerState(&w, power_requested_power_state(mi->hdl));
 
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceGetInstance(
+static CMPIStatus LMI_AssociatedPowerManagementServiceGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -110,7 +110,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceCreateInstance(
+static CMPIStatus LMI_AssociatedPowerManagementServiceCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -120,7 +120,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceModifyInstance(
+static CMPIStatus LMI_AssociatedPowerManagementServiceModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -131,7 +131,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceDeleteInstance(
+static CMPIStatus LMI_AssociatedPowerManagementServiceDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -140,7 +140,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceExecQuery(
+static CMPIStatus LMI_AssociatedPowerManagementServiceExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -151,7 +151,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceAssociationCleanup(
+static CMPIStatus LMI_AssociatedPowerManagementServiceAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -162,7 +162,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceAssociators(
+static CMPIStatus LMI_AssociatedPowerManagementServiceAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -174,7 +174,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociators(
     const char** properties)
 {
     if (!assocClass) {
-        assocClass = "Cura_AssociatedPowerManagementService";
+        assocClass = "LMI_AssociatedPowerManagementService";
     }
 
     return KDefaultAssociators(
@@ -183,7 +183,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociators(
         cc,
         cr,
         cop,
-        Cura_AssociatedPowerManagementService_ClassName,
+        LMI_AssociatedPowerManagementService_ClassName,
         assocClass,
         resultClass,
         role,
@@ -191,7 +191,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociators(
         properties);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceAssociatorNames(
+static CMPIStatus LMI_AssociatedPowerManagementServiceAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -202,7 +202,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociatorNames(
     const char* resultRole)
 {
     if (!assocClass) {
-        assocClass = "Cura_AssociatedPowerManagementService";
+        assocClass = "LMI_AssociatedPowerManagementService";
     }
 
     return KDefaultAssociatorNames(
@@ -211,14 +211,14 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_AssociatedPowerManagementService_ClassName,
+        LMI_AssociatedPowerManagementService_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceReferences(
+static CMPIStatus LMI_AssociatedPowerManagementServiceReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -228,7 +228,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceReferences(
     const char** properties)
 {
     if (!assocClass) {
-        assocClass = "Cura_AssociatedPowerManagementService";
+        assocClass = "LMI_AssociatedPowerManagementService";
     }
 
     return KDefaultReferences(
@@ -237,13 +237,13 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceReferences(
         cc,
         cr,
         cop,
-        Cura_AssociatedPowerManagementService_ClassName,
+        LMI_AssociatedPowerManagementService_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_AssociatedPowerManagementServiceReferenceNames(
+static CMPIStatus LMI_AssociatedPowerManagementServiceReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -252,7 +252,7 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceReferenceNames(
     const char* role)
 {
     if (!assocClass) {
-        assocClass = "Cura_AssociatedPowerManagementService";
+        assocClass = "LMI_AssociatedPowerManagementService";
     }
 
     return KDefaultReferenceNames(
@@ -261,25 +261,25 @@ static CMPIStatus Cura_AssociatedPowerManagementServiceReferenceNames(
         cc,
         cr,
         cop,
-        Cura_AssociatedPowerManagementService_ClassName,
+        LMI_AssociatedPowerManagementService_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_AssociatedPowerManagementService,
-    Cura_AssociatedPowerManagementService,
+    LMI_AssociatedPowerManagementService,
+    LMI_AssociatedPowerManagementService,
     _cb,
-    Cura_AssociatedPowerManagementServiceInitialize(&mi))
+    LMI_AssociatedPowerManagementServiceInitialize(&mi))
 
 CMAssociationMIStub( 
-    Cura_AssociatedPowerManagementService,
-    Cura_AssociatedPowerManagementService,
+    LMI_AssociatedPowerManagementService,
+    LMI_AssociatedPowerManagementService,
     _cb,
-    Cura_AssociatedPowerManagementServiceAssociationInitialize(&mi))
+    LMI_AssociatedPowerManagementServiceAssociationInitialize(&mi))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_AssociatedPowerManagementService",
-    "Cura_AssociatedPowerManagementService",
+    "LMI_AssociatedPowerManagementService",
+    "LMI_AssociatedPowerManagementService",
     "instance association")
diff --git a/src/power/Cura_ConcreteJobProvider.c b/src/power/LMI_ConcreteJobProvider.c
index 54775dc..7677ef4 100644
--- a/src/power/Cura_ConcreteJobProvider.c
+++ b/src/power/LMI_ConcreteJobProvider.c
@@ -17,24 +17,24 @@
 
 #include <konkret/konkret.h>
 #include <stdint.h>
-#include "Cura_ConcreteJob.h"
+#include "LMI_ConcreteJob.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb = NULL;
 
 #include "power.h"
 
-static void Cura_ConcreteJobInitializeInstance(CMPIInstanceMI *mi)
+static void LMI_ConcreteJobInitializeInstance(CMPIInstanceMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static void Cura_ConcreteJobInitializeMethod(CMPIMethodMI *mi)
+static void LMI_ConcreteJobInitializeMethod(CMPIMethodMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static CMPIStatus Cura_ConcreteJobCleanup(
+static CMPIStatus LMI_ConcreteJobCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -47,7 +47,7 @@ static CMPIStatus Cura_ConcreteJobCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ConcreteJobEnumInstanceNames(
+static CMPIStatus LMI_ConcreteJobEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -57,7 +57,7 @@ static CMPIStatus Cura_ConcreteJobEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_ConcreteJobEnumInstances(
+static CMPIStatus LMI_ConcreteJobEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -72,12 +72,12 @@ static CMPIStatus Cura_ConcreteJobEnumInstances(
 
     while (plist) {
         powerStateChangeJob = plist->data;
-        Cura_ConcreteJob concreteJob;
-        Cura_ConcreteJob_Init(&concreteJob, _cb, ns);
-        Cura_ConcreteJob_Set_InstanceID(&concreteJob, "Cura_PowerStateChange_ConcreteJob:123"); // TODO: unique ID
-        Cura_ConcreteJob_Set_JobState(&concreteJob, job_state(powerStateChangeJob));
-        Cura_ConcreteJob_Set_TimeOfLastStateChange(&concreteJob, CMNewDateTimeFromBinary(_cb, ((uint64_t) job_timeOfLastChange(powerStateChangeJob)) * 1000000, 0, &status));
-        //Cura_ConcreteJob_Set_
+        LMI_ConcreteJob concreteJob;
+        LMI_ConcreteJob_Init(&concreteJob, _cb, ns);
+        LMI_ConcreteJob_Set_InstanceID(&concreteJob, "LMI_PowerStateChange_ConcreteJob:123"); // TODO: unique ID
+        LMI_ConcreteJob_Set_JobState(&concreteJob, job_state(powerStateChangeJob));
+        LMI_ConcreteJob_Set_TimeOfLastStateChange(&concreteJob, CMNewDateTimeFromBinary(_cb, ((uint64_t) job_timeOfLastChange(powerStateChangeJob)) * 1000000, 0, &status));
+        //LMI_ConcreteJob_Set_
         KReturnInstance(cr, concreteJob);
         plist = g_list_next(plist);
     }
@@ -85,7 +85,7 @@ static CMPIStatus Cura_ConcreteJobEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ConcreteJobGetInstance(
+static CMPIStatus LMI_ConcreteJobGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -96,7 +96,7 @@ static CMPIStatus Cura_ConcreteJobGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_ConcreteJobCreateInstance(
+static CMPIStatus LMI_ConcreteJobCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -107,7 +107,7 @@ static CMPIStatus Cura_ConcreteJobCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ConcreteJobModifyInstance(
+static CMPIStatus LMI_ConcreteJobModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -118,7 +118,7 @@ static CMPIStatus Cura_ConcreteJobModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ConcreteJobDeleteInstance(
+static CMPIStatus LMI_ConcreteJobDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -127,7 +127,7 @@ static CMPIStatus Cura_ConcreteJobDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ConcreteJobExecQuery(
+static CMPIStatus LMI_ConcreteJobExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -139,12 +139,12 @@ static CMPIStatus Cura_ConcreteJobExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_ConcreteJob,
-    Cura_ConcreteJob,
+    LMI_ConcreteJob,
+    LMI_ConcreteJob,
     _cb,
-    Cura_ConcreteJobInitializeInstance(&mi))
+    LMI_ConcreteJobInitializeInstance(&mi))
 
-static CMPIStatus Cura_ConcreteJobMethodCleanup(
+static CMPIStatus LMI_ConcreteJobMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -153,7 +153,7 @@ static CMPIStatus Cura_ConcreteJobMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ConcreteJobInvokeMethod(
+static CMPIStatus LMI_ConcreteJobInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -162,21 +162,21 @@ static CMPIStatus Cura_ConcreteJobInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_ConcreteJob_DispatchMethod(
+    return LMI_ConcreteJob_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_ConcreteJob,
-    Cura_ConcreteJob,
+    LMI_ConcreteJob,
+    LMI_ConcreteJob,
     _cb,
-    Cura_ConcreteJobInitializeMethod(&mi))
+    LMI_ConcreteJobInitializeMethod(&mi))
 
-KUint32 Cura_ConcreteJob_KillJob(
+KUint32 LMI_ConcreteJob_KillJob(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ConcreteJobRef* self,
+    const LMI_ConcreteJobRef* self,
     const KBoolean* DeleteOnKill,
     CMPIStatus* status)
 {
@@ -186,11 +186,11 @@ KUint32 Cura_ConcreteJob_KillJob(
     return result;
 }
 
-KUint32 Cura_ConcreteJob_RequestStateChange(
+KUint32 LMI_ConcreteJob_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ConcreteJobRef* self,
+    const LMI_ConcreteJobRef* self,
     const KUint16* RequestedState,
     const KDateTime* TimeoutPeriod,
     CMPIStatus* status)
@@ -201,11 +201,11 @@ KUint32 Cura_ConcreteJob_RequestStateChange(
     return result;
 }
 
-KUint32 Cura_ConcreteJob_GetError(
+KUint32 LMI_ConcreteJob_GetError(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ConcreteJobRef* self,
+    const LMI_ConcreteJobRef* self,
     KString* Error,
     CMPIStatus* status)
 {
@@ -217,6 +217,6 @@ KUint32 Cura_ConcreteJob_GetError(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_ConcreteJob",
-    "Cura_ConcreteJob",
+    "LMI_ConcreteJob",
+    "LMI_ConcreteJob",
     "instance method")
diff --git a/src/power/Cura_ElementCapabilitiesProvider.c b/src/power/LMI_ElementCapabilitiesProvider.c
index 6d08021..46ebe8c 100644
--- a/src/power/Cura_ElementCapabilitiesProvider.c
+++ b/src/power/LMI_ElementCapabilitiesProvider.c
@@ -16,16 +16,16 @@
  */
 
 #include <konkret/konkret.h>
-#include "Cura_ElementCapabilities.h"
+#include "LMI_ElementCapabilities.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_ElementCapabilitiesInitialize()
+static void LMI_ElementCapabilitiesInitialize()
 {
 }
 
-static CMPIStatus Cura_ElementCapabilitiesCleanup(
+static CMPIStatus LMI_ElementCapabilitiesCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -33,7 +33,7 @@ static CMPIStatus Cura_ElementCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesEnumInstanceNames(
+static CMPIStatus LMI_ElementCapabilitiesEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -43,7 +43,7 @@ static CMPIStatus Cura_ElementCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesEnumInstances(
+static CMPIStatus LMI_ElementCapabilitiesEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -52,29 +52,29 @@ static CMPIStatus Cura_ElementCapabilitiesEnumInstances(
 {
     const char *ns = KNameSpace(cop);
 
-    Cura_ElementCapabilities w;
-    Cura_ElementCapabilities_Init(&w, _cb, ns);
+    LMI_ElementCapabilities w;
+    LMI_ElementCapabilities_Init(&w, _cb, ns);
 
-    Cura_PowerManagementServiceRef powerManagementServiceRef;
-    Cura_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
-    Cura_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Cura_PowerManagementService");
-    Cura_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
+    LMI_PowerManagementServiceRef powerManagementServiceRef;
+    LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
+    LMI_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "LMI_PowerManagementService");
+    LMI_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
 
-    Cura_ElementCapabilities_Set_ManagedElement(&w, &powerManagementServiceRef);
+    LMI_ElementCapabilities_Set_ManagedElement(&w, &powerManagementServiceRef);
 
-    Cura_PowerManagementCapabilitiesRef powerManagementCapabilitiesRef;
-    Cura_PowerManagementCapabilitiesRef_Init(&powerManagementCapabilitiesRef, _cb, ns);
-    Cura_PowerManagementCapabilitiesRef_Set_InstanceID(&powerManagementCapabilitiesRef, "RedHat:PowerManagementCapabilities");
+    LMI_PowerManagementCapabilitiesRef powerManagementCapabilitiesRef;
+    LMI_PowerManagementCapabilitiesRef_Init(&powerManagementCapabilitiesRef, _cb, ns);
+    LMI_PowerManagementCapabilitiesRef_Set_InstanceID(&powerManagementCapabilitiesRef, "RedHat:PowerManagementCapabilities");
 
-    Cura_ElementCapabilities_Set_Capabilities(&w, &powerManagementCapabilitiesRef);
+    LMI_ElementCapabilities_Set_Capabilities(&w, &powerManagementCapabilitiesRef);
 
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesGetInstance(
+static CMPIStatus LMI_ElementCapabilitiesGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -85,7 +85,7 @@ static CMPIStatus Cura_ElementCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesCreateInstance(
+static CMPIStatus LMI_ElementCapabilitiesCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -95,7 +95,7 @@ static CMPIStatus Cura_ElementCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesModifyInstance(
+static CMPIStatus LMI_ElementCapabilitiesModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -106,7 +106,7 @@ static CMPIStatus Cura_ElementCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesDeleteInstance(
+static CMPIStatus LMI_ElementCapabilitiesDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -115,7 +115,7 @@ static CMPIStatus Cura_ElementCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesExecQuery(
+static CMPIStatus LMI_ElementCapabilitiesExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -126,7 +126,7 @@ static CMPIStatus Cura_ElementCapabilitiesExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesAssociationCleanup(
+static CMPIStatus LMI_ElementCapabilitiesAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -134,7 +134,7 @@ static CMPIStatus Cura_ElementCapabilitiesAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesAssociators(
+static CMPIStatus LMI_ElementCapabilitiesAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -151,7 +151,7 @@ static CMPIStatus Cura_ElementCapabilitiesAssociators(
         cc,
         cr,
         cop,
-        Cura_ElementCapabilities_ClassName,
+        LMI_ElementCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
@@ -159,7 +159,7 @@ static CMPIStatus Cura_ElementCapabilitiesAssociators(
         properties);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesAssociatorNames(
+static CMPIStatus LMI_ElementCapabilitiesAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -175,14 +175,14 @@ static CMPIStatus Cura_ElementCapabilitiesAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_ElementCapabilities_ClassName,
+        LMI_ElementCapabilities_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesReferences(
+static CMPIStatus LMI_ElementCapabilitiesReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -197,13 +197,13 @@ static CMPIStatus Cura_ElementCapabilitiesReferences(
         cc,
         cr,
         cop,
-        Cura_ElementCapabilities_ClassName,
+        LMI_ElementCapabilities_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_ElementCapabilitiesReferenceNames(
+static CMPIStatus LMI_ElementCapabilitiesReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -217,25 +217,25 @@ static CMPIStatus Cura_ElementCapabilitiesReferenceNames(
         cc,
         cr,
         cop,
-        Cura_ElementCapabilities_ClassName,
+        LMI_ElementCapabilities_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_ElementCapabilities,
-    Cura_ElementCapabilities,
+    LMI_ElementCapabilities,
+    LMI_ElementCapabilities,
     _cb,
-    Cura_ElementCapabilitiesInitialize())
+    LMI_ElementCapabilitiesInitialize())
 
 CMAssociationMIStub( 
-    Cura_ElementCapabilities,
-    Cura_ElementCapabilities,
+    LMI_ElementCapabilities,
+    LMI_ElementCapabilities,
     _cb,
-    Cura_ElementCapabilitiesInitialize())
+    LMI_ElementCapabilitiesInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_ElementCapabilities",
-    "Cura_ElementCapabilities",
+    "LMI_ElementCapabilities",
+    "LMI_ElementCapabilities",
     "instance association")
diff --git a/src/power/Cura_HostedServiceProvider.c b/src/power/LMI_HostedServiceProvider.c
index e396446..e6bf6f1 100644
--- a/src/power/Cura_HostedServiceProvider.c
+++ b/src/power/LMI_HostedServiceProvider.c
@@ -17,17 +17,17 @@
 
 #include <cmpimacs.h>
 #include <konkret/konkret.h>
-#include "Cura_HostedService.h"
+#include "LMI_HostedService.h"
 
 #include "globals.h"
 
 static const CMPIBroker* _cb;
 
-static void Cura_HostedServiceInitialize()
+static void LMI_HostedServiceInitialize()
 {
 }
 
-static CMPIStatus Cura_HostedServiceCleanup(
+static CMPIStatus LMI_HostedServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -35,7 +35,7 @@ static CMPIStatus Cura_HostedServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceEnumInstanceNames(
+static CMPIStatus LMI_HostedServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -45,7 +45,7 @@ static CMPIStatus Cura_HostedServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_HostedServiceEnumInstances(
+static CMPIStatus LMI_HostedServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -55,8 +55,8 @@ static CMPIStatus Cura_HostedServiceEnumInstances(
     CMPIStatus rc;
     const char *ns = KNameSpace(cop);
 
-    Cura_HostedService w;
-    Cura_HostedService_Init(&w, _cb, ns);
+    LMI_HostedService w;
+    LMI_HostedService_Init(&w, _cb, ns);
 
     CIM_ComputerSystemRef computerSystemRef;
     CIM_ComputerSystemRef_Init(&computerSystemRef, _cb, ns);
@@ -64,21 +64,21 @@ static CMPIStatus Cura_HostedServiceEnumInstances(
     CIM_ComputerSystemRef_Set_CreationClassName(&computerSystemRef, get_system_creation_class_name());
     CMPIObjectPath *computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&computerSystemRef, &rc);
     computerSystemOP->ft->setClassName(computerSystemOP, get_system_creation_class_name());
-    Cura_HostedService_SetObjectPath_Antecedent(&w, computerSystemOP);
+    LMI_HostedService_SetObjectPath_Antecedent(&w, computerSystemOP);
 
-    Cura_PowerManagementServiceRef powerManagementServiceRef;
-    Cura_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
-    Cura_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
-    Cura_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "Cura_PowerManagementService");
-    Cura_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
-    Cura_HostedService_Set_Dependent(&w, &powerManagementServiceRef);
+    LMI_PowerManagementServiceRef powerManagementServiceRef;
+    LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
+    LMI_PowerManagementServiceRef_Set_Name(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
+    LMI_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "LMI_PowerManagementService");
+    LMI_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
+    LMI_HostedService_Set_Dependent(&w, &powerManagementServiceRef);
 
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceGetInstance(
+static CMPIStatus LMI_HostedServiceGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -89,7 +89,7 @@ static CMPIStatus Cura_HostedServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_HostedServiceCreateInstance(
+static CMPIStatus LMI_HostedServiceCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -99,7 +99,7 @@ static CMPIStatus Cura_HostedServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceModifyInstance(
+static CMPIStatus LMI_HostedServiceModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -110,7 +110,7 @@ static CMPIStatus Cura_HostedServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceDeleteInstance(
+static CMPIStatus LMI_HostedServiceDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -119,7 +119,7 @@ static CMPIStatus Cura_HostedServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceExecQuery(
+static CMPIStatus LMI_HostedServiceExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -130,7 +130,7 @@ static CMPIStatus Cura_HostedServiceExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_HostedServiceAssociationCleanup(
+static CMPIStatus LMI_HostedServiceAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -138,7 +138,7 @@ static CMPIStatus Cura_HostedServiceAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_HostedServiceAssociators(
+static CMPIStatus LMI_HostedServiceAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -155,7 +155,7 @@ static CMPIStatus Cura_HostedServiceAssociators(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         resultClass,
         role,
@@ -163,7 +163,7 @@ static CMPIStatus Cura_HostedServiceAssociators(
         properties);
 }
 
-static CMPIStatus Cura_HostedServiceAssociatorNames(
+static CMPIStatus LMI_HostedServiceAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -179,14 +179,14 @@ static CMPIStatus Cura_HostedServiceAssociatorNames(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus Cura_HostedServiceReferences(
+static CMPIStatus LMI_HostedServiceReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -201,13 +201,13 @@ static CMPIStatus Cura_HostedServiceReferences(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus Cura_HostedServiceReferenceNames(
+static CMPIStatus LMI_HostedServiceReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -221,25 +221,25 @@ static CMPIStatus Cura_HostedServiceReferenceNames(
         cc,
         cr,
         cop,
-        Cura_HostedService_ClassName,
+        LMI_HostedService_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    Cura_HostedService,
-    Cura_HostedService,
+    LMI_HostedService,
+    LMI_HostedService,
     _cb,
-    Cura_HostedServiceInitialize())
+    LMI_HostedServiceInitialize())
 
 CMAssociationMIStub( 
-    Cura_HostedService,
-    Cura_HostedService,
+    LMI_HostedService,
+    LMI_HostedService,
     _cb,
-    Cura_HostedServiceInitialize())
+    LMI_HostedServiceInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_HostedService",
-    "Cura_HostedService",
+    "LMI_HostedService",
+    "LMI_HostedService",
     "instance association")
diff --git a/src/power/Cura_PowerManagementCapabilitiesProvider.c b/src/power/LMI_PowerManagementCapabilitiesProvider.c
index 587733c..d97c144 100644
--- a/src/power/Cura_PowerManagementCapabilitiesProvider.c
+++ b/src/power/LMI_PowerManagementCapabilitiesProvider.c
@@ -16,23 +16,23 @@
  */
 
 #include <konkret/konkret.h>
-#include "Cura_PowerManagementCapabilities.h"
+#include "LMI_PowerManagementCapabilities.h"
 
 #include "power.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_PowerManagementCapabilitiesInitialize(CMPIInstanceMI *mi)
+static void LMI_PowerManagementCapabilitiesInitialize(CMPIInstanceMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static void Cura_PowerManagementCapabilitiesInitializeMethod(CMPIMethodMI *mi)
+static void LMI_PowerManagementCapabilitiesInitializeMethod(CMPIMethodMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesCleanup(
+static CMPIStatus LMI_PowerManagementCapabilitiesCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -42,7 +42,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesEnumInstanceNames(
+static CMPIStatus LMI_PowerManagementCapabilitiesEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -52,7 +52,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesEnumInstances(
+static CMPIStatus LMI_PowerManagementCapabilitiesEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -61,30 +61,30 @@ static CMPIStatus Cura_PowerManagementCapabilitiesEnumInstances(
 {
     const char *ns = KNameSpace(cop);
 
-    Cura_PowerManagementCapabilities w;
-    Cura_PowerManagementCapabilities_Init(&w, _cb, ns);
+    LMI_PowerManagementCapabilities w;
+    LMI_PowerManagementCapabilities_Init(&w, _cb, ns);
     // TODO: make it unique
-    Cura_PowerManagementCapabilities_Set_InstanceID(&w, "Linux:PowerManagementCapabilities");
-    Cura_PowerManagementCapabilities_Set_ElementName(&w, "Linux:PowerManagementCapabilities");
-    Cura_PowerManagementCapabilities_Set_Caption(&w, "Linux:PowerManagementCapabilities");
+    LMI_PowerManagementCapabilities_Set_InstanceID(&w, "Linux:PowerManagementCapabilities");
+    LMI_PowerManagementCapabilities_Set_ElementName(&w, "Linux:PowerManagementCapabilities");
+    LMI_PowerManagementCapabilities_Set_Caption(&w, "Linux:PowerManagementCapabilities");
 
     int count;
     unsigned short *list = power_available_requested_power_states(mi->hdl, &count);
-    Cura_PowerManagementCapabilities_Init_PowerStatesSupported(&w, count);
+    LMI_PowerManagementCapabilities_Init_PowerStatesSupported(&w, count);
     for (int i = 0; i < count; i++) {
-        Cura_PowerManagementCapabilities_Set_PowerStatesSupported(&w, i, list[i]);
+        LMI_PowerManagementCapabilities_Set_PowerStatesSupported(&w, i, list[i]);
     }
 
     // TODO: get this list dynamically from PowerStatesSupported (see SMASH)
-    Cura_PowerManagementCapabilities_Init_PowerChangeCapabilities(&w, 3);
-    Cura_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 0, Cura_PowerManagementCapabilities_PowerChangeCapabilities_Power_State_Settable);
-    Cura_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 1, Cura_PowerManagementCapabilities_PowerChangeCapabilities_Power_Cycling_Supported);
-    Cura_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 2, Cura_PowerManagementCapabilities_PowerChangeCapabilities_Graceful_Shutdown_Supported);
+    LMI_PowerManagementCapabilities_Init_PowerChangeCapabilities(&w, 3);
+    LMI_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 0, LMI_PowerManagementCapabilities_PowerChangeCapabilities_Power_State_Settable);
+    LMI_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 1, LMI_PowerManagementCapabilities_PowerChangeCapabilities_Power_Cycling_Supported);
+    LMI_PowerManagementCapabilities_Set_PowerChangeCapabilities(&w, 2, LMI_PowerManagementCapabilities_PowerChangeCapabilities_Graceful_Shutdown_Supported);
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesGetInstance(
+static CMPIStatus LMI_PowerManagementCapabilitiesGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -95,7 +95,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesCreateInstance(
+static CMPIStatus LMI_PowerManagementCapabilitiesCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -105,7 +105,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesModifyInstance(
+static CMPIStatus LMI_PowerManagementCapabilitiesModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -116,7 +116,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesDeleteInstance(
+static CMPIStatus LMI_PowerManagementCapabilitiesDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -125,7 +125,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesExecQuery(
+static CMPIStatus LMI_PowerManagementCapabilitiesExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -137,12 +137,12 @@ static CMPIStatus Cura_PowerManagementCapabilitiesExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_PowerManagementCapabilities,
-    Cura_PowerManagementCapabilities,
+    LMI_PowerManagementCapabilities,
+    LMI_PowerManagementCapabilities,
     _cb,
-    Cura_PowerManagementCapabilitiesInitialize(&mi))
+    LMI_PowerManagementCapabilitiesInitialize(&mi))
 
-static CMPIStatus Cura_PowerManagementCapabilitiesMethodCleanup(
+static CMPIStatus LMI_PowerManagementCapabilitiesMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -153,7 +153,7 @@ static CMPIStatus Cura_PowerManagementCapabilitiesMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementCapabilitiesInvokeMethod(
+static CMPIStatus LMI_PowerManagementCapabilitiesInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -162,18 +162,18 @@ static CMPIStatus Cura_PowerManagementCapabilitiesInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_PowerManagementCapabilities_DispatchMethod(
+    return LMI_PowerManagementCapabilities_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_PowerManagementCapabilities,
-    Cura_PowerManagementCapabilities,
+    LMI_PowerManagementCapabilities,
+    LMI_PowerManagementCapabilities,
     _cb,
-    Cura_PowerManagementCapabilitiesInitializeMethod(&mi))
+    LMI_PowerManagementCapabilitiesInitializeMethod(&mi))
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_PowerManagementCapabilities",
-    "Cura_PowerManagementCapabilities",
+    "LMI_PowerManagementCapabilities",
+    "LMI_PowerManagementCapabilities",
     "instance method")
diff --git a/src/power/Cura_PowerManagementServiceProvider.c b/src/power/LMI_PowerManagementServiceProvider.c
index 493cc63..d3857cb 100644
--- a/src/power/Cura_PowerManagementServiceProvider.c
+++ b/src/power/LMI_PowerManagementServiceProvider.c
@@ -15,25 +15,25 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Cura_PowerManagementService.h"
+#include "LMI_PowerManagementService.h"
 
 #include "power.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_PowerManagementServiceInitialize(CMPIInstanceMI *mi)
+static void LMI_PowerManagementServiceInitialize(CMPIInstanceMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
-static void Cura_PowerManagementServiceMethodInitialize(CMPIMethodMI *mi)
+static void LMI_PowerManagementServiceMethodInitialize(CMPIMethodMI *mi)
 {
     mi->hdl = power_ref(_cb);
 }
 
 
-static CMPIStatus Cura_PowerManagementServiceCleanup(
+static CMPIStatus LMI_PowerManagementServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -43,7 +43,7 @@ static CMPIStatus Cura_PowerManagementServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementServiceEnumInstanceNames(
+static CMPIStatus LMI_PowerManagementServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -53,26 +53,26 @@ static CMPIStatus Cura_PowerManagementServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus Cura_PowerManagementServiceEnumInstances(
+static CMPIStatus LMI_PowerManagementServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_PowerManagementService w;
+    LMI_PowerManagementService w;
 
-    Cura_PowerManagementService_Init(&w, _cb, KNameSpace(cop));
-    Cura_PowerManagementService_Set_CreationClassName(&w, "Cura_PowerManagementService");
-    Cura_PowerManagementService_Set_Name(&w, get_system_name());
-    Cura_PowerManagementService_Set_SystemCreationClassName(&w, get_system_creation_class_name());
-    Cura_PowerManagementService_Set_SystemName(&w, get_system_name());
+    LMI_PowerManagementService_Init(&w, _cb, KNameSpace(cop));
+    LMI_PowerManagementService_Set_CreationClassName(&w, "LMI_PowerManagementService");
+    LMI_PowerManagementService_Set_Name(&w, get_system_name());
+    LMI_PowerManagementService_Set_SystemCreationClassName(&w, get_system_creation_class_name());
+    LMI_PowerManagementService_Set_SystemName(&w, get_system_name());
 
     /* EnabledState is an integer enumeration that indicates the enabled
      * and disabled states of an element. It can also indicate the transitions
      * between these requested states.
      */
-    Cura_PowerManagementService_Set_EnabledState(&w, Cura_PowerManagementService_EnabledDefault_Enabled);
+    LMI_PowerManagementService_Set_EnabledState(&w, LMI_PowerManagementService_EnabledDefault_Enabled);
 
 
     /* RequestedState is an integer enumeration that indicates the last
@@ -81,20 +81,20 @@ static CMPIStatus Cura_PowerManagementServiceEnumInstances(
      * represented by EnabledState. This property is provided to compare the
      * last requested and current enabled or disabled states.
      */
-    Cura_PowerManagementService_Set_RequestedState(&w, Cura_PowerManagementService_RequestedState_No_Change);
+    LMI_PowerManagementService_Set_RequestedState(&w, LMI_PowerManagementService_RequestedState_No_Change);
 
-    Cura_PowerManagementService_Init_AvailableRequestedStates(&w, 2);
-    Cura_PowerManagementService_Set_AvailableRequestedStates(&w, 0, 2); // Enabled
-    Cura_PowerManagementService_Set_AvailableRequestedStates(&w, 1, 3); // Disabled
+    LMI_PowerManagementService_Init_AvailableRequestedStates(&w, 2);
+    LMI_PowerManagementService_Set_AvailableRequestedStates(&w, 0, 2); // Enabled
+    LMI_PowerManagementService_Set_AvailableRequestedStates(&w, 1, 3); // Disabled
 
 
-    Cura_PowerManagementService_Print(&w, stderr);
+    LMI_PowerManagementService_Print(&w, stderr);
 
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementServiceGetInstance(
+static CMPIStatus LMI_PowerManagementServiceGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -105,7 +105,7 @@ static CMPIStatus Cura_PowerManagementServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus Cura_PowerManagementServiceCreateInstance(
+static CMPIStatus LMI_PowerManagementServiceCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -115,7 +115,7 @@ static CMPIStatus Cura_PowerManagementServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementServiceModifyInstance(
+static CMPIStatus LMI_PowerManagementServiceModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -126,7 +126,7 @@ static CMPIStatus Cura_PowerManagementServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementServiceDeleteInstance(
+static CMPIStatus LMI_PowerManagementServiceDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -135,7 +135,7 @@ static CMPIStatus Cura_PowerManagementServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_PowerManagementServiceExecQuery(
+static CMPIStatus LMI_PowerManagementServiceExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -147,12 +147,12 @@ static CMPIStatus Cura_PowerManagementServiceExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_PowerManagementService,
-    Cura_PowerManagementService,
+    LMI_PowerManagementService,
+    LMI_PowerManagementService,
     _cb,
-    Cura_PowerManagementServiceInitialize(&mi))
+    LMI_PowerManagementServiceInitialize(&mi))
 
-static CMPIStatus Cura_PowerManagementServiceMethodCleanup(
+static CMPIStatus LMI_PowerManagementServiceMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -162,7 +162,7 @@ static CMPIStatus Cura_PowerManagementServiceMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_PowerManagementServiceInvokeMethod(
+static CMPIStatus LMI_PowerManagementServiceInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -171,21 +171,21 @@ static CMPIStatus Cura_PowerManagementServiceInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_PowerManagementService_DispatchMethod(
+    return LMI_PowerManagementService_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_PowerManagementService,
-    Cura_PowerManagementService,
+    LMI_PowerManagementService,
+    LMI_PowerManagementService,
     _cb,
-    Cura_PowerManagementServiceMethodInitialize(&mi))
+    LMI_PowerManagementServiceMethodInitialize(&mi))
 
-KUint32 Cura_PowerManagementService_RequestStateChange(
+KUint32 LMI_PowerManagementService_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_PowerManagementServiceRef* self,
+    const LMI_PowerManagementServiceRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -198,11 +198,11 @@ KUint32 Cura_PowerManagementService_RequestStateChange(
 
 }
 
-KUint32 Cura_PowerManagementService_StartService(
+KUint32 LMI_PowerManagementService_StartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_PowerManagementServiceRef* self,
+    const LMI_PowerManagementServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -211,11 +211,11 @@ KUint32 Cura_PowerManagementService_StartService(
     return result;
 }
 
-KUint32 Cura_PowerManagementService_StopService(
+KUint32 LMI_PowerManagementService_StopService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_PowerManagementServiceRef* self,
+    const LMI_PowerManagementServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -224,11 +224,11 @@ KUint32 Cura_PowerManagementService_StopService(
     return result;
 }
 
-KUint32 Cura_PowerManagementService_SetPowerState(
+KUint32 LMI_PowerManagementService_SetPowerState(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_PowerManagementServiceRef* self,
+    const LMI_PowerManagementServiceRef* self,
     const KUint16* PowerState,
     const KRef* ManagedElement,
     const KDateTime* Time,
@@ -240,11 +240,11 @@ KUint32 Cura_PowerManagementService_SetPowerState(
     return result;
 }
 
-KUint32 Cura_PowerManagementService_RequestPowerStateChange(
+KUint32 LMI_PowerManagementService_RequestPowerStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_PowerManagementServiceRef* self,
+    const LMI_PowerManagementServiceRef* self,
     const KUint16* PowerState,
     const KRef* ManagedElement,
     const KDateTime* Time,
@@ -279,6 +279,6 @@ KUint32 Cura_PowerManagementService_RequestPowerStateChange(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_PowerManagementService",
-    "Cura_PowerManagementService",
+    "LMI_PowerManagementService",
+    "LMI_PowerManagementService",
     "instance method")
diff --git a/src/power/power.c b/src/power/power.c
index bf22b1d..af4d124 100644
--- a/src/power/power.c
+++ b/src/power/power.c
@@ -22,8 +22,8 @@
 
 #include <glib.h>
 
-#include "Cura_AssociatedPowerManagementService.h"
-#include "Cura_ConcreteJob.h"
+#include "LMI_AssociatedPowerManagementService.h"
+#include "LMI_ConcreteJob.h"
 
 #ifdef HAS_UPOWER
 #include <upower.h>
@@ -87,8 +87,8 @@ Power *power_new(const CMPIBroker *_cb)
     Power *power = malloc(sizeof(Power));
     power->broker = _cb;
     power->instances = 0;
-    power->requestedPowerState = Cura_AssociatedPowerManagementService_RequestedPowerState_Unknown;
-    power->transitioningToPowerState = Cura_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
+    power->requestedPowerState = LMI_AssociatedPowerManagementService_RequestedPowerState_Unknown;
+    power->transitioningToPowerState = LMI_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
     power->mutex = _cb->xft->newMutex(0);
     power->jobs = NULL;
 #ifdef HAS_UPOWER
@@ -142,7 +142,7 @@ void *state_change_thread(void *data)
 {
     PowerStateChangeJob *powerStateChangeJob = data;
     MUTEX_LOCK(powerStateChangeJob);
-    powerStateChangeJob->jobState = Cura_ConcreteJob_JobState_Running;
+    powerStateChangeJob->jobState = LMI_ConcreteJob_JobState_Running;
     powerStateChangeJob->timeOfLastChange = time(NULL);
     MUTEX_UNLOCK(powerStateChangeJob);
 
@@ -150,14 +150,14 @@ void *state_change_thread(void *data)
     // Check if the job was cancelled
     if (powerStateChangeJob->cancelled) {
         MUTEX_LOCK(powerStateChangeJob);
-        powerStateChangeJob->jobState = Cura_ConcreteJob_JobState_Terminated;
+        powerStateChangeJob->jobState = LMI_ConcreteJob_JobState_Terminated;
         powerStateChangeJob->timeOfLastChange = time(NULL);
         MUTEX_UNLOCK(powerStateChangeJob);
 
         if (!powerStateChangeJob->superseded) {
             // There is no job that replaced this job
             MUTEX_LOCK(powerStateChangeJob->power);
-            powerStateChangeJob->power->transitioningToPowerState = Cura_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
+            powerStateChangeJob->power->transitioningToPowerState = LMI_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
             MUTEX_UNLOCK(powerStateChangeJob->power);
         }
 
@@ -172,7 +172,7 @@ void *state_change_thread(void *data)
 
     int succeeded = 0;
     switch (powerStateChangeJob->requestedPowerState) {
-        case Cura_AssociatedPowerManagementService_PowerState_Sleep__Deep:
+        case LMI_AssociatedPowerManagementService_PowerState_Sleep__Deep:
             // Sleep
 #ifdef HAS_UPOWER
             succeeded = up_client_suspend_sync(powerStateChangeJob->power->up, NULL, &error);
@@ -180,7 +180,7 @@ void *state_change_thread(void *data)
             succeeded = system("pm-suspend") == 0;
 #endif
             break;
-        case Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft:
+        case LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft:
             // Reboot (without shutting down programs)
 #ifdef HAS_SYSTEMCTL
             succeeded = system("systemctl --force reboot &") == 0;
@@ -188,7 +188,7 @@ void *state_change_thread(void *data)
             succeeded =  system("reboot --force &") == 0;
 #endif
             break;
-        case Cura_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft:
+        case LMI_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft:
             // Hibernate
 #ifdef HAS_UPOWER
             succeeded = up_client_hibernate_sync(powerStateChangeJob->power->up, NULL, &error);
@@ -196,7 +196,7 @@ void *state_change_thread(void *data)
             succeeded =  system("pm-hibernate") == 0;
 #endif
             break;
-        case Cura_AssociatedPowerManagementService_PowerState_Off___Soft:
+        case LMI_AssociatedPowerManagementService_PowerState_Off___Soft:
             // Poweroff (without shutting down programs)
 #ifdef HAS_SYSTEMCTL
             succeeded = system("systemctl --force poweroff &") == 0;
@@ -204,7 +204,7 @@ void *state_change_thread(void *data)
             succeeded =  system("shutdown --halt now &") == 0;
 #endif
             break;
-        case Cura_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful:
+        case LMI_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful:
             // Poweroff (shut down programs first)
 #ifdef HAS_SYSTEMCTL
             succeeded = system("systemctl poweroff &") == 0;
@@ -212,7 +212,7 @@ void *state_change_thread(void *data)
             succeeded =  system("shutdown --poweroff now &") == 0;
 #endif
             break;
-        case Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful:
+        case LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful:
             // Reboot (shut down programs first)
 #ifdef HAS_SYSTEMCTL
             succeeded = system("systemctl reboot &") == 0;
@@ -223,14 +223,14 @@ void *state_change_thread(void *data)
     }
 
     MUTEX_LOCK(powerStateChangeJob->power);
-    powerStateChangeJob->power->transitioningToPowerState = Cura_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
+    powerStateChangeJob->power->transitioningToPowerState = LMI_AssociatedPowerManagementService_TransitioningToPowerState_No_Change;
     MUTEX_UNLOCK(powerStateChangeJob->power);
 
     MUTEX_LOCK(powerStateChangeJob);
     if (succeeded) {
-        powerStateChangeJob->jobState = Cura_ConcreteJob_JobState_Completed;
+        powerStateChangeJob->jobState = LMI_ConcreteJob_JobState_Completed;
     } else {
-        powerStateChangeJob->jobState = Cura_ConcreteJob_JobState_Exception;
+        powerStateChangeJob->jobState = LMI_ConcreteJob_JobState_Exception;
 #ifdef HAS_UPOWER
         if (error != NULL) {
             powerStateChangeJob->error = error->message;
@@ -267,7 +267,7 @@ int power_request_power_state(Power *power, unsigned short state)
     powerStateChangeJob->power = power;
     powerStateChangeJob->mutex = power->broker->xft->newMutex(0);
     powerStateChangeJob->requestedPowerState = state;
-    powerStateChangeJob->jobState = Cura_ConcreteJob_JobState_New;
+    powerStateChangeJob->jobState = LMI_ConcreteJob_JobState_New;
     powerStateChangeJob->cancelled = 0;
     powerStateChangeJob->superseded = 0;
     powerStateChangeJob->timeOfLastChange = time(NULL);
@@ -283,13 +283,13 @@ int power_request_power_state(Power *power, unsigned short state)
     while (plist) {
         job = plist->data;
         MUTEX_LOCK(job);
-        if (job->jobState != Cura_ConcreteJob_JobState_Suspended &&
-            job->jobState != Cura_ConcreteJob_JobState_Killed &&
-            job->jobState != Cura_ConcreteJob_JobState_Terminated) {
+        if (job->jobState != LMI_ConcreteJob_JobState_Suspended &&
+            job->jobState != LMI_ConcreteJob_JobState_Killed &&
+            job->jobState != LMI_ConcreteJob_JobState_Terminated) {
 
             job->cancelled = 1;
             job->superseded = 1;
-            job->jobState = Cura_ConcreteJob_JobState_Shutting_Down;
+            job->jobState = LMI_ConcreteJob_JobState_Shutting_Down;
             job->timeOfLastChange = time(NULL);
         }
         MUTEX_UNLOCK(job);
@@ -309,7 +309,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
     int i = 0;
 
     /* 1 Other
-     * Cura_AssociatedPowerManagementService_PowerState_Other
+     * LMI_AssociatedPowerManagementService_PowerState_Other
      */
 
     /* 2 On
@@ -317,7 +317,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Bring system to full On from any state (Sleep, Hibernate, Off)
      *
-     * Cura_AssociatedPowerManagementService_PowerState_On
+     * LMI_AssociatedPowerManagementService_PowerState_On
      */
     // not supported
 
@@ -326,7 +326,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Standby
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Sleep___Light
+     * LMI_AssociatedPowerManagementService_PowerState_Sleep___Light
      */
     // not supported
 
@@ -335,16 +335,16 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Suspend
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Sleep__Deep
+     * LMI_AssociatedPowerManagementService_PowerState_Sleep__Deep
      */
     // Sleep
 #ifdef HAS_UPOWER
     if (up_client_get_can_suspend(power->up)) {
-        list[i++] = Cura_AssociatedPowerManagementService_PowerState_Sleep__Deep;
+        list[i++] = LMI_AssociatedPowerManagementService_PowerState_Sleep__Deep;
     }
 #else
     if (system("pm-is-supported --suspend") == 0) {
-        list[i++] = Cura_AssociatedPowerManagementService_PowerState_Sleep__Deep;
+        list[i++] = LMI_AssociatedPowerManagementService_PowerState_Sleep__Deep;
     }
 #endif
 
@@ -354,10 +354,10 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Reset system without removing power
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft
+     * LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft
      */
     // Reboot (without shutting down programs)
-    list[i++] = Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft;
+    list[i++] = LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft;
 
     /* 6 Off - Hard
      * corresponding to ACPI state G3, S5, or D3.
@@ -365,7 +365,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * Power Off performed through mechanical means like unplugging
      * power cable or UPS On
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Off___Hard
+     * LMI_AssociatedPowerManagementService_PowerState_Off___Hard
      */
 
     /* 7 Hibernate (Off - Soft)
@@ -375,16 +375,16 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * System context and OS image written to non-volatile storage;
      * system and devices powered off
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft
+     * LMI_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft
      */
     // Hibernate
 #ifdef HAS_UPOWER
     if (up_client_get_can_hibernate(power->up)) {
-        list[i++] = Cura_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft;
+        list[i++] = LMI_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft;
     }
 #else
     if (system("pm-is-supported --hibernate") == 0) {
-        list[i++] = Cura_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft;
+        list[i++] = LMI_AssociatedPowerManagementService_PowerState_Hibernate_Off___Soft;
     }
 #endif
 
@@ -393,10 +393,10 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * System power off but auxiliary or flea power may be available
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Off___Soft
+     * LMI_AssociatedPowerManagementService_PowerState_Off___Soft
      */
     // Poweroff (without shutting down programs)
-    list[i++] = Cura_AssociatedPowerManagementService_PowerState_Off___Soft;
+    list[i++] = LMI_AssociatedPowerManagementService_PowerState_Off___Soft;
 
     /* 9 Power Cycle (Off-Hard)
      * corresponds to the managed element reaching the ACPI state G3
@@ -404,7 +404,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Equivalent to Off–Hard followed by On
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off_Hard
+     * LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off_Hard
      */
     // not implemented
 
@@ -414,7 +414,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Hardware reset
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Master_Bus_Reset
+     * LMI_AssociatedPowerManagementService_PowerState_Master_Bus_Reset
      */
     // not implemented
 
@@ -424,7 +424,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      *
      * Hardware reset
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Diagnostic_Interrupt_NMI
+     * LMI_AssociatedPowerManagementService_PowerState_Diagnostic_Interrupt_NMI
      */
     // not implemented
 
@@ -435,10 +435,10 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * System power off but auxiliary or flea power may be available but preceded
      * by a request to the managed element to perform an orderly shutdown.
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful
+     * LMI_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful
      */
     // Poweroff (shut down programs first)
-    list[i++] = Cura_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful;
+    list[i++] = LMI_AssociatedPowerManagementService_PowerState_Off___Soft_Graceful;
 
     /* 13 Off - Hard Graceful
      * equivalent to Off Hard but preceded by a request to the managed element
@@ -448,7 +448,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * or UPS On but preceded by a request to the managed element to perform
      * an orderly shutdown.
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Off___Hard_Graceful
+     * LMI_AssociatedPowerManagementService_PowerState_Off___Hard_Graceful
      */
     // not implemented
 
@@ -459,7 +459,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * Hardware reset but preceded by a request to the managed element
      * to perform an orderly shutdown.
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Master_Bus_Reset_Graceful
+     * LMI_AssociatedPowerManagementService_PowerState_Master_Bus_Reset_Graceful
      */
     // not implemented
 
@@ -470,10 +470,10 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * Reset system without removing power but preceded by a request
      * to the managed element to perform an orderly shutdown.
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful
+     * LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful
      */
     // Reboot (shut down programs first)
-    list[i++] = Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful;
+    list[i++] = LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Soft_Graceful;
 
     /* 16 Power Cycle (Off - Hard Graceful)
      * equivalent to Power Cycle (Off - Hard) but preceded by a request
@@ -482,7 +482,7 @@ unsigned short *power_available_requested_power_states(Power *power, int *count)
      * Equivalent to Off–Hard followed by On but preceded by a request
      * to the managed element to perform an orderly shutdown.
      *
-     * Cura_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Hard_Graceful
+     * LMI_AssociatedPowerManagementService_PowerState_Power_Cycle_Off___Hard_Graceful
      */
     // not implemented
 
@@ -502,9 +502,9 @@ GList *power_get_jobs(Power *power)
     while (plist) {
         powerStateChangeJob = plist->data;
         MUTEX_LOCK(powerStateChangeJob);
-        if ((powerStateChangeJob->jobState == Cura_ConcreteJob_JobState_Completed ||
-             powerStateChangeJob->jobState == Cura_ConcreteJob_JobState_Killed ||
-             powerStateChangeJob->jobState == Cura_ConcreteJob_JobState_Terminated) &&
+        if ((powerStateChangeJob->jobState == LMI_ConcreteJob_JobState_Completed ||
+             powerStateChangeJob->jobState == LMI_ConcreteJob_JobState_Killed ||
+             powerStateChangeJob->jobState == LMI_ConcreteJob_JobState_Terminated) &&
             time(NULL) - powerStateChangeJob->timeOfLastChange > powerStateChangeJob->timeBeforeRemoval) {
 
             MUTEX_LOCK(power);
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 55c61cc..2997213 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME Service)
 set(LIBRARY_NAME cmpiCura_${PROVIDER_NAME})
-set(MOF Cura_Service.mof)
+set(MOF LMI_Service.mof)
 
 set(provider_SRCS
     util/serviceutil.c
diff --git a/src/service/Cura_ServiceProvider.c b/src/service/LMI_ServiceProvider.c
index b8363c7..77ed59e 100644
--- a/src/service/Cura_ServiceProvider.c
+++ b/src/service/LMI_ServiceProvider.c
@@ -18,17 +18,17 @@
 
 #include <konkret/konkret.h>
 #include <stdint.h>
-#include "Cura_Service.h"
+#include "LMI_Service.h"
 #include "util/serviceutil.h"
 #include "globals.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void Cura_ServiceInitialize()
+static void LMI_ServiceInitialize()
 {
 }
 
-static CMPIStatus Cura_ServiceCleanup(
+static CMPIStatus LMI_ServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -36,7 +36,7 @@ static CMPIStatus Cura_ServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceEnumInstanceNames(
+static CMPIStatus LMI_ServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -47,12 +47,12 @@ static CMPIStatus Cura_ServiceEnumInstanceNames(
 
     slist = Service_Find_All();
     for (int i = 0; i < slist->cnt; i++) {
-        Cura_ServiceRef w;
-        Cura_ServiceRef_Init(&w, _cb, ns);
-        Cura_ServiceRef_Set_CreationClassName(&w, "Cura_Service");
-        Cura_ServiceRef_Set_SystemCreationClassName(&w, get_system_creation_class_name());
-        Cura_ServiceRef_Set_SystemName(&w, get_system_name());
-        Cura_ServiceRef_Set_Name(&w, slist->name[i]);
+        LMI_ServiceRef w;
+        LMI_ServiceRef_Init(&w, _cb, ns);
+        LMI_ServiceRef_Set_CreationClassName(&w, "LMI_Service");
+        LMI_ServiceRef_Set_SystemCreationClassName(&w, get_system_creation_class_name());
+        LMI_ServiceRef_Set_SystemName(&w, get_system_name());
+        LMI_ServiceRef_Set_Name(&w, slist->name[i]);
 
         KReturnObjectPath(cr, w);
     }
@@ -61,7 +61,7 @@ static CMPIStatus Cura_ServiceEnumInstanceNames(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceEnumInstances(
+static CMPIStatus LMI_ServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -71,7 +71,7 @@ static CMPIStatus Cura_ServiceEnumInstances(
     CMPIStatus st;
     CMPIEnumeration* e;
     if (!(e = _cb->bft->enumerateInstanceNames(_cb, cc, cop, &st))) {
-        KReturn2(_cb, ERR_FAILED, "Unable to enumerate instances of Cura_Service");
+        KReturn2(_cb, ERR_FAILED, "Unable to enumerate instances of LMI_Service");
     }
     CMPIData cd;
     while (CMHasNext(e, &st)) {
@@ -82,38 +82,38 @@ static CMPIStatus Cura_ServiceEnumInstances(
         }
         CMPIInstance *in = _cb->bft->getInstance(_cb, cc, cd.value.ref, properties, &st);
         if (st.rc) {
-            KReturn2(_cb, ERR_FAILED, "Unable to get instance of Cura_Service");
+            KReturn2(_cb, ERR_FAILED, "Unable to get instance of LMI_Service");
         }
         cr->ft->returnInstance(cr, in);
     }
     KReturn(OK);
 }
 
-static CMPIStatus Cura_ServiceGetInstance(
+static CMPIStatus LMI_ServiceGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    Cura_Service w;
-    Cura_Service_InitFromObjectPath(&w, _cb, cop);
+    LMI_Service w;
+    LMI_Service_InitFromObjectPath(&w, _cb, cop);
 
     void *enumhdl = Service_Begin_Enum(w.Name.chars);
     Service servicebuf;
     if (Service_Next_Enum(enumhdl, &servicebuf, w.Name.chars)) {
-        Cura_Service_Set_Status(&w, servicebuf.svStatus);
-        Cura_Service_Set_Started(&w, servicebuf.svStarted);
+        LMI_Service_Set_Status(&w, servicebuf.svStatus);
+        LMI_Service_Set_Started(&w, servicebuf.svStarted);
 
         switch (servicebuf.svEnabledDefault) {
             case ENABLED:
-                Cura_Service_Set_EnabledDefault(&w, Cura_Service_EnabledDefault_Enabled);
+                LMI_Service_Set_EnabledDefault(&w, LMI_Service_EnabledDefault_Enabled);
                 break;
             case DISABLED:
-                Cura_Service_Set_EnabledDefault(&w, Cura_Service_EnabledDefault_Disabled);
+                LMI_Service_Set_EnabledDefault(&w, LMI_Service_EnabledDefault_Disabled);
                 break;
             default:
-                Cura_Service_Set_EnabledDefault(&w, Cura_Service_EnabledDefault_Not_Applicable);
+                LMI_Service_Set_EnabledDefault(&w, LMI_Service_EnabledDefault_Not_Applicable);
                 break;
         }
 
@@ -125,7 +125,7 @@ static CMPIStatus Cura_ServiceGetInstance(
     }
 }
 
-static CMPIStatus Cura_ServiceCreateInstance(
+static CMPIStatus LMI_ServiceCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -135,7 +135,7 @@ static CMPIStatus Cura_ServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceModifyInstance(
+static CMPIStatus LMI_ServiceModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -146,7 +146,7 @@ static CMPIStatus Cura_ServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceDeleteInstance(
+static CMPIStatus LMI_ServiceDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -155,7 +155,7 @@ static CMPIStatus Cura_ServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus Cura_ServiceExecQuery(
+static CMPIStatus LMI_ServiceExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -167,12 +167,12 @@ static CMPIStatus Cura_ServiceExecQuery(
 }
 
 CMInstanceMIStub(
-    Cura_Service,
-    Cura_Service,
+    LMI_Service,
+    LMI_Service,
     _cb,
-    Cura_ServiceInitialize())
+    LMI_ServiceInitialize())
 
-static CMPIStatus Cura_ServiceMethodCleanup(
+static CMPIStatus LMI_ServiceMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -180,7 +180,7 @@ static CMPIStatus Cura_ServiceMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus Cura_ServiceInvokeMethod(
+static CMPIStatus LMI_ServiceInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -189,21 +189,21 @@ static CMPIStatus Cura_ServiceInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return Cura_Service_DispatchMethod(
+    return LMI_Service_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    Cura_Service,
-    Cura_Service,
+    LMI_Service,
+    LMI_Service,
     _cb,
-    Cura_ServiceInitialize())
+    LMI_ServiceInitialize())
 
-KUint32 Cura_Service_RequestStateChange(
+KUint32 LMI_Service_RequestStateChange(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     const KUint16* RequestedState,
     KRef* Job,
     const KDateTime* TimeoutPeriod,
@@ -227,11 +227,11 @@ unsigned int Service_RunOperation(const char *service, const char *operation, CM
     return res;
 }
 
-KUint32 Cura_Service_StartService(
+KUint32 LMI_Service_StartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -239,11 +239,11 @@ KUint32 Cura_Service_StartService(
     return result;
 }
 
-KUint32 Cura_Service_StopService(
+KUint32 LMI_Service_StopService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -251,11 +251,11 @@ KUint32 Cura_Service_StopService(
     return result;
 }
 
-KUint32 Cura_Service_ReloadService(
+KUint32 LMI_Service_ReloadService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -263,11 +263,11 @@ KUint32 Cura_Service_ReloadService(
     return result;
 }
 
-KUint32 Cura_Service_RestartService(
+KUint32 LMI_Service_RestartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -275,11 +275,11 @@ KUint32 Cura_Service_RestartService(
     return result;
 }
 
-KUint32 Cura_Service_TryRestartService(
+KUint32 LMI_Service_TryRestartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -287,11 +287,11 @@ KUint32 Cura_Service_TryRestartService(
     return result;
 }
 
-KUint32 Cura_Service_CondRestartService(
+KUint32 LMI_Service_CondRestartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -299,11 +299,11 @@ KUint32 Cura_Service_CondRestartService(
     return result;
 }
 
-KUint32 Cura_Service_ReloadOrRestartService(
+KUint32 LMI_Service_ReloadOrRestartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -311,11 +311,11 @@ KUint32 Cura_Service_ReloadOrRestartService(
     return result;
 }
 
-KUint32 Cura_Service_ReloadOrTryRestartService(
+KUint32 LMI_Service_ReloadOrTryRestartService(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -323,11 +323,11 @@ KUint32 Cura_Service_ReloadOrTryRestartService(
     return result;
 }
 
-KUint32 Cura_Service_TurnServiceOn(
+KUint32 LMI_Service_TurnServiceOn(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -335,11 +335,11 @@ KUint32 Cura_Service_TurnServiceOn(
     return result;
 }
 
-KUint32 Cura_Service_TurnServiceOff(
+KUint32 LMI_Service_TurnServiceOff(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const Cura_ServiceRef* self,
+    const LMI_ServiceRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -349,6 +349,6 @@ KUint32 Cura_Service_TurnServiceOff(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "Cura_Service",
-    "Cura_Service",
+    "LMI_Service",
+    "LMI_Service",
     "instance method")