renamed openlmi namespace to lmi

To comply with lmi shell, which is placed in *lmi* package, and to
make our imports shorter, we are renaming *openlmi* namespace to *lmi*.

60 files changed, 213 insertions, 215 deletions

diff --git a/src/python/openlmi/__init__.py b/src/python/lmi/__init__.py
index de40ea7..de40ea7 100644
--- a/src/python/openlmi/__init__.py
+++ b/src/python/lmi/__init__.py
diff --git a/src/python/openlmi/common/IndicationManager.py b/src/python/lmi/common/IndicationManager.py
index f9a1655..0467227 100644
--- a/src/python/openlmi/common/IndicationManager.py
+++ b/src/python/lmi/common/IndicationManager.py
@@ -28,8 +28,8 @@ import re
 import socket
 import threading
 
-import openlmi.common.cmpi_logging as cmpi_logging
-from openlmi.common import singletonmixin
+import lmi.common.cmpi_logging as cmpi_logging
+from lmi.common import singletonmixin
 
 RE_FILTER_NAME = re.compile(r'^(?P<prefix>lmi:'
     r'(?P<class_name>[a-z0-9_]+):)(?P<filter_id>.*)$', re.IGNORECASE)
diff --git a/src/python/openlmi/common/JobManager.py b/src/python/lmi/common/JobManager.py
index 9f977c9..59e80e3 100644
--- a/src/python/openlmi/common/JobManager.py
+++ b/src/python/lmi/common/JobManager.py
@@ -46,9 +46,9 @@ from datetime import datetime, timedelta
 import threading
 from Queue import Queue
 import pywbem
-import openlmi.common.cmpi_logging as cmpi_logging
-import openlmi.common
-from openlmi.common.IndicationManager import IndicationManager
+import lmi.common.cmpi_logging as cmpi_logging
+import lmi.common
+from lmi.common.IndicationManager import IndicationManager
 from pywbem.cim_provider2 import CIMProvider2
 import socket
 import traceback
@@ -846,7 +846,7 @@ class JobManager(object):
         """
         if classname is None:
             classname = self.job_classname
-        the_id = openlmi.common.parse_instance_id(instance_id, classname)
+        the_id = lmi.common.parse_instance_id(instance_id, classname)
         if not the_id.isdigit():
             return None
         return self.jobs.get(the_id, None)
diff --git a/src/python/openlmi/common/TimerManager.py b/src/python/lmi/common/TimerManager.py
index 42d48cd..01e53b8 100644
--- a/src/python/openlmi/common/TimerManager.py
+++ b/src/python/lmi/common/TimerManager.py
@@ -50,10 +50,10 @@ it may be already being scheduled / called.
 """
 
 import ctypes
-import openlmi.common.singletonmixin as singletonmixin
+import lmi.common.singletonmixin as singletonmixin
 import threading
 import Queue
-import openlmi.common.cmpi_logging as cmpi_logging
+import lmi.common.cmpi_logging as cmpi_logging
 
 class TimerException(Exception):
     pass
diff --git a/src/python/openlmi/common/__init__.py b/src/python/lmi/common/__init__.py
index baebcdb..baebcdb 100644
--- a/src/python/openlmi/common/__init__.py
+++ b/src/python/lmi/common/__init__.py
diff --git a/src/python/openlmi/common/cmpi_logging.py b/src/python/lmi/common/cmpi_logging.py
index d9fb5e8..a97e4ab 100644
--- a/src/python/openlmi/common/cmpi_logging.py
+++ b/src/python/lmi/common/cmpi_logging.py
@@ -132,7 +132,7 @@ class LogManager(object):
     FORMAT_STDERR = '%(levelname)s: %(message)s'
     FORMAT_CMPI = '%(levelname)s: %(message)s'
 
-    LOGGER_NAME = "openlmi.storage"
+    LOGGER_NAME = "lmi.storage"
 
     def __init__(self, env):
         """
diff --git a/src/python/openlmi/common/singletonmixin.py b/src/python/lmi/common/singletonmixin.py
index c252676..c252676 100644
--- a/src/python/openlmi/common/singletonmixin.py
+++ b/src/python/lmi/common/singletonmixin.py
diff --git a/src/python/setup.py b/src/python/setup.py
index 9d4ef7c..b36d455 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -1,13 +1,13 @@
 from setuptools import setup
 setup(
-    name='openlmi',
+    name='lmi',
     description='OpenLMI python providers',
     author='Michal Minar',
     author_email='miminar@redhat.com',
     url='https://fedorahosted.org/openlmi/',
-    version='0.2',
-    namespace_packages = ['openlmi'],
-    packages = ['openlmi', 'openlmi.common'],
+    version='0.3',
+    namespace_packages = ['lmi'],
+    packages = ['lmi', 'lmi.common'],
     classifiers=[
         'license :: osi approved :: gnu lesser general public license v2 or later (lgplv2+)',
         'operating system :: posix :: linux',
diff --git a/src/software/cli/software.py b/src/software/cli/software.py
index effc0c4..93704ae 100755
--- a/src/software/cli/software.py
+++ b/src/software/cli/software.py
@@ -30,8 +30,8 @@ import pywbem
 import socket
 import sys
 
-from openlmi.software import util
-from openlmi.software.core import SystemSoftwareCollection
+from lmi.software import util
+from lmi.software.core import SystemSoftwareCollection
 
 CIM_ERROR2TEXT = defaultdict(lambda: "OTHER_ERROR", {
     1  : "FAILED",
diff --git a/src/software/openlmi/__init__.py b/src/software/lmi/__init__.py
index aa4170a..aa4170a 100644
--- a/src/software/openlmi/__init__.py
+++ b/src/software/lmi/__init__.py
diff --git a/src/software/openlmi/software/LMI_AffectedSoftwareJobElement.py b/src/software/lmi/software/LMI_AffectedSoftwareJobElement.py
index e02fc7a..12e6a35 100644
--- a/src/software/openlmi/software/LMI_AffectedSoftwareJobElement.py
+++ b/src/software/lmi/software/LMI_AffectedSoftwareJobElement.py
@@ -24,10 +24,10 @@ Instruments the CIM class LMI_AffectedSoftwareJobElement
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import AffectedSoftwareJobElement
-from openlmi.software.core import Job
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import AffectedSoftwareJobElement
+from lmi.software.core import Job
+from lmi.software.yumdb import YumDB
 
 class LMI_AffectedSoftwareJobElement(CIMProvider2):
     """Instrument the CIM class LMI_AffectedSoftwareJobElement
diff --git a/src/software/openlmi/software/LMI_AssociatedSoftwareInstallationServiceCapabilities.py b/src/software/lmi/software/LMI_AssociatedSoftwareInstallationServiceCapabilities.py
index 18d02ba..15b8df9 100644
--- a/src/software/openlmi/software/LMI_AssociatedSoftwareInstallationServiceCapabilities.py
+++ b/src/software/lmi/software/LMI_AssociatedSoftwareInstallationServiceCapabilities.py
@@ -24,10 +24,10 @@ Instruments the CIM class LMI_AssociatedSoftwareInstallationServiceCapabilities
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import InstallationService
-from openlmi.software.core import InstallationServiceCapabilities
-from openlmi.software.core import AssociatedInstallationServiceCapabilities
+from lmi.common import cmpi_logging
+from lmi.software.core import InstallationService
+from lmi.software.core import InstallationServiceCapabilities
+from lmi.software.core import AssociatedInstallationServiceCapabilities
 
 class LMI_AssociatedSoftwareInstallationServiceCapabilities(CIMProvider2):
     """Instrument the CIM class \
diff --git a/src/software/openlmi/software/LMI_AssociatedSoftwareJobMethodResult.py b/src/software/lmi/software/LMI_AssociatedSoftwareJobMethodResult.py
index c942882..fa2bad7 100644
--- a/src/software/openlmi/software/LMI_AssociatedSoftwareJobMethodResult.py
+++ b/src/software/lmi/software/LMI_AssociatedSoftwareJobMethodResult.py
@@ -24,11 +24,11 @@ Instruments the CIM class LMI_AssociatedSoftwareJobMethodResult
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import Job
-from openlmi.software.core import MethodResult
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import Job
+from lmi.software.core import MethodResult
+from lmi.software.yumdb import YumDB
 
 @cmpi_logging.trace_function
 def generate_job_referents(_env, object_name, model, _keys_only):
diff --git a/src/software/openlmi/software/LMI_HostedSoftwareCollection.py b/src/software/lmi/software/LMI_HostedSoftwareCollection.py
index 4a51041..7249bd6 100644
--- a/src/software/openlmi/software/LMI_HostedSoftwareCollection.py
+++ b/src/software/lmi/software/LMI_HostedSoftwareCollection.py
@@ -24,8 +24,8 @@ Instruments the CIM class LMI_HostedSoftwareCollection
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem, SystemCollection
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem, SystemCollection
 
 class LMI_HostedSoftwareCollection(CIMProvider2):
     """Instrument the CIM class LMI_HostedSoftwareCollection
diff --git a/src/software/openlmi/software/LMI_HostedSoftwareIdentityResource.py b/src/software/lmi/software/LMI_HostedSoftwareIdentityResource.py
index d6e07b0..767523a 100644
--- a/src/software/openlmi/software/LMI_HostedSoftwareIdentityResource.py
+++ b/src/software/lmi/software/LMI_HostedSoftwareIdentityResource.py
@@ -28,11 +28,11 @@ Instruments the CIM class LMI_HostedSoftwareIdentityResource
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import IdentityResource
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import ComputerSystem
+from lmi.software.core import IdentityResource
+from lmi.software.yumdb import YumDB
 
 @cmpi_logging.trace_function
 def generate_system_referents(env, object_name, model, _keys_only):
diff --git a/src/software/openlmi/software/LMI_HostedSoftwareInstallationService.py b/src/software/lmi/software/LMI_HostedSoftwareInstallationService.py
index 04b136d..5c650cb 100644
--- a/src/software/openlmi/software/LMI_HostedSoftwareInstallationService.py
+++ b/src/software/lmi/software/LMI_HostedSoftwareInstallationService.py
@@ -29,8 +29,8 @@ Instruments the CIM class LMI_HostedSoftwareInstallationService
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem, InstallationService
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem, InstallationService
 
 class LMI_HostedSoftwareInstallationService(CIMProvider2):
     """Instrument the CIM class LMI_HostedSoftwareInstallationService
diff --git a/src/software/openlmi/software/LMI_InstalledSoftwareIdentity.py b/src/software/lmi/software/LMI_InstalledSoftwareIdentity.py
index 82c2049..429a7a2 100644
--- a/src/software/openlmi/software/LMI_InstalledSoftwareIdentity.py
+++ b/src/software/lmi/software/LMI_InstalledSoftwareIdentity.py
@@ -28,11 +28,11 @@ Instruments the CIM class LMI_InstalledSoftwareIdentity
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import Identity
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import ComputerSystem
+from lmi.software.core import Identity
+from lmi.software.yumdb import YumDB
 
 @cmpi_logging.trace_function
 def generate_system_referents(env, object_name, model, _keys_only):
diff --git a/src/software/openlmi/software/LMI_MemberOfSoftwareCollection.py b/src/software/lmi/software/LMI_MemberOfSoftwareCollection.py
index 1868efa..f66f788 100644
--- a/src/software/openlmi/software/LMI_MemberOfSoftwareCollection.py
+++ b/src/software/lmi/software/LMI_MemberOfSoftwareCollection.py
@@ -24,11 +24,11 @@ Instruments the CIM class LMI_MemberOfSoftwareCollection
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import SystemCollection
-from openlmi.software.core import Identity
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import SystemCollection
+from lmi.software.core import Identity
+from lmi.software.yumdb import YumDB
 
 @cmpi_logging.trace_function
 def generate_collection_referents(env, object_name, model, _keys_only):
diff --git a/src/software/openlmi/software/LMI_OwningSoftwareJobElement.py b/src/software/lmi/software/LMI_OwningSoftwareJobElement.py
index 5f15ebe..5f8b3a8 100644
--- a/src/software/openlmi/software/LMI_OwningSoftwareJobElement.py
+++ b/src/software/lmi/software/LMI_OwningSoftwareJobElement.py
@@ -24,10 +24,10 @@ Instruments the CIM class LMI_OwningSoftwareJobElement
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import InstallationService
-from openlmi.software.core import Job
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import InstallationService
+from lmi.software.core import Job
+from lmi.software.yumdb import YumDB
 
 class LMI_OwningSoftwareJobElement(CIMProvider2):
     """Instrument the CIM class LMI_OwningSoftwareJobElement 
diff --git a/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py b/src/software/lmi/software/LMI_ResourceForSoftwareIdentity.py
index 7afa264..ca22337 100644
--- a/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py
+++ b/src/software/lmi/software/LMI_ResourceForSoftwareIdentity.py
@@ -24,11 +24,11 @@ Instruments the CIM class LMI_ResourceForSoftwareIdentity
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import Identity
-from openlmi.software.core import IdentityResource
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import Identity
+from lmi.software.core import IdentityResource
+from lmi.software.yumdb import YumDB
 
 @cmpi_logging.trace_function
 def generate_package_referents(_env, object_name, model, _keys_only):
diff --git a/src/software/openlmi/software/LMI_SoftwareIdentity.py b/src/software/lmi/software/LMI_SoftwareIdentity.py
index 62c9875..722f86c 100644
--- a/src/software/openlmi/software/LMI_SoftwareIdentity.py
+++ b/src/software/lmi/software/LMI_SoftwareIdentity.py
@@ -25,9 +25,9 @@ Instruments the CIM class LMI_SoftwareIdentity
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import Identity
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import Identity
+from lmi.software.yumdb import YumDB
 
 class LMI_SoftwareIdentity(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareIdentity
diff --git a/src/software/openlmi/software/LMI_SoftwareIdentityChecks.py b/src/software/lmi/software/LMI_SoftwareIdentityChecks.py
index f90f6c2..47ae3f4 100644
--- a/src/software/openlmi/software/LMI_SoftwareIdentityChecks.py
+++ b/src/software/lmi/software/LMI_SoftwareIdentityChecks.py
@@ -28,10 +28,10 @@ Instruments the CIM class LMI_SoftwareIdentityChecks
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import generate_references
-from openlmi.software.core import Identity, IdentityFileCheck
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import generate_references
+from lmi.software.core import Identity, IdentityFileCheck
+from lmi.software.yumdb import YumDB
 
 def generate_identity_referents(_env, object_name, model, _keys_only):
     """
diff --git a/src/software/openlmi/software/LMI_SoftwareIdentityFileCheck.py b/src/software/lmi/software/LMI_SoftwareIdentityFileCheck.py
index 2a79302..fe6f101 100644
--- a/src/software/openlmi/software/LMI_SoftwareIdentityFileCheck.py
+++ b/src/software/lmi/software/LMI_SoftwareIdentityFileCheck.py
@@ -28,9 +28,9 @@ Instruments the CIM class LMI_SoftwareIdentityFileCheck
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import IdentityFileCheck
-from openlmi.software.core import ComputerSystem
+from lmi.common import cmpi_logging
+from lmi.software.core import IdentityFileCheck
+from lmi.software.core import ComputerSystem
 
 class LMI_SoftwareIdentityFileCheck(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareIdentityFileCheck
diff --git a/src/software/openlmi/software/LMI_SoftwareIdentityResource.py b/src/software/lmi/software/LMI_SoftwareIdentityResource.py
index 1377520..ff359b7 100644
--- a/src/software/openlmi/software/LMI_SoftwareIdentityResource.py
+++ b/src/software/lmi/software/LMI_SoftwareIdentityResource.py
@@ -28,9 +28,9 @@ Instruments the CIM class LMI_SoftwareIdentityResource
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import IdentityResource
-from openlmi.software.yumdb import YumDB, errors
+from lmi.common import cmpi_logging
+from lmi.software.core import IdentityResource
+from lmi.software.yumdb import YumDB, errors
 
 class LMI_SoftwareIdentityResource(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareIdentityResource
diff --git a/src/software/openlmi/software/LMI_SoftwareInstallationService.py b/src/software/lmi/software/LMI_SoftwareInstallationService.py
index eec3869..7b2b73e 100644
--- a/src/software/openlmi/software/LMI_SoftwareInstallationService.py
+++ b/src/software/lmi/software/LMI_SoftwareInstallationService.py
@@ -24,9 +24,9 @@ Instruments the CIM class LMI_SoftwareInstallationService
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import Job
-from openlmi.software.core import InstallationService
+from lmi.common import cmpi_logging
+from lmi.software.core import Job
+from lmi.software.core import InstallationService
 
 class LMI_SoftwareInstallationService(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareInstallationService
diff --git a/src/software/openlmi/software/LMI_SoftwareInstallationServiceAffectsElement.py b/src/software/lmi/software/LMI_SoftwareInstallationServiceAffectsElement.py
index 8ca43bb..92d5c26 100644
--- a/src/software/openlmi/software/LMI_SoftwareInstallationServiceAffectsElement.py
+++ b/src/software/lmi/software/LMI_SoftwareInstallationServiceAffectsElement.py
@@ -24,12 +24,12 @@ Instruments the CIM class LMI_SoftwareInstallationServiceAffectsElement
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import Identity
-from openlmi.software.core import InstallationService
-from openlmi.software.core import InstallationServiceAffectsElement
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem
+from lmi.software.core import Identity
+from lmi.software.core import InstallationService
+from lmi.software.core import InstallationServiceAffectsElement
+from lmi.software.yumdb import YumDB
 
 def generate_service_referents(env, model, object_name, keys_only):
     """
diff --git a/src/software/openlmi/software/LMI_SoftwareInstallationServiceCapabilities.py b/src/software/lmi/software/LMI_SoftwareInstallationServiceCapabilities.py
index 9b88de6..739d391 100644
--- a/src/software/openlmi/software/LMI_SoftwareInstallationServiceCapabilities.py
+++ b/src/software/lmi/software/LMI_SoftwareInstallationServiceCapabilities.py
@@ -24,8 +24,8 @@ Instruments the CIM class LMI_SoftwareInstallationServiceCapabilities
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import InstallationServiceCapabilities
+from lmi.common import cmpi_logging
+from lmi.software.core import InstallationServiceCapabilities
 
 class LMI_SoftwareInstallationServiceCapabilities(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareInstallationServiceCapabilities
diff --git a/src/software/openlmi/software/LMI_SoftwareJob.py b/src/software/lmi/software/LMI_SoftwareJob.py
index b6d7ca5..79275bf 100644
--- a/src/software/openlmi/software/LMI_SoftwareJob.py
+++ b/src/software/lmi/software/LMI_SoftwareJob.py
@@ -26,9 +26,9 @@ Instruments the CIM class LMI_SoftwareJob
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import Job
-from openlmi.software.yumdb import errors, YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import Job
+from lmi.software.yumdb import errors, YumDB
 
 class LMI_SoftwareJob(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareJob
diff --git a/src/software/openlmi/software/LMI_SoftwareMethodResult.py b/src/software/lmi/software/LMI_SoftwareMethodResult.py
index 71c3ca9..b4d5a21 100644
--- a/src/software/openlmi/software/LMI_SoftwareMethodResult.py
+++ b/src/software/lmi/software/LMI_SoftwareMethodResult.py
@@ -25,9 +25,10 @@ Instruments the CIM class LMI_SoftwareMethodResult
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import MethodResult
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import MethodResult
+from lmi.software.yumdb import YumDB
+
 class LMI_SoftwareMethodResult(CIMProvider2):
     """Instrument the CIM class LMI_SoftwareMethodResult
 
diff --git a/src/software/openlmi/software/LMI_SystemSoftwareCollection.py b/src/software/lmi/software/LMI_SystemSoftwareCollection.py
index a392994..6aea1d9 100644
--- a/src/software/openlmi/software/LMI_SystemSoftwareCollection.py
+++ b/src/software/lmi/software/LMI_SystemSoftwareCollection.py
@@ -23,8 +23,8 @@ Instruments the CIM class LMI_SystemSoftwareCollection
 import pywbem
 from pywbem.cim_provider2 import CIMProvider2
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import SystemCollection
+from lmi.common import cmpi_logging
+from lmi.software.core import SystemCollection
 
 class LMI_SystemSoftwareCollection(CIMProvider2):
     """Instrument the CIM class LMI_SystemSoftwareCollection
diff --git a/src/software/openlmi/software/__init__.py b/src/software/lmi/software/__init__.py
index ffdae3f..ffdae3f 100644
--- a/src/software/openlmi/software/__init__.py
+++ b/src/software/lmi/software/__init__.py
diff --git a/src/software/openlmi/software/cimom_entry.py b/src/software/lmi/software/cimom_entry.py
index 7d39a21..89ad17f 100644
--- a/src/software/openlmi/software/cimom_entry.py
+++ b/src/software/lmi/software/cimom_entry.py
@@ -25,56 +25,53 @@ Entry module for OpenLMI Software providers.
 """
 
 from multiprocessing import Queue
-from openlmi.common import cmpi_logging
-from openlmi.common import JobManager
-from openlmi.common.IndicationManager import IndicationManager
-from openlmi.software.core import Job
-from openlmi.software.LMI_SoftwareIdentity import LMI_SoftwareIdentity
-from openlmi.software.LMI_SystemSoftwareCollection import \
+from lmi.common import cmpi_logging
+from lmi.common import JobManager
+from lmi.common.IndicationManager import IndicationManager
+from lmi.software.core import Job
+from lmi.software.LMI_SoftwareIdentity import LMI_SoftwareIdentity
+from lmi.software.LMI_SystemSoftwareCollection import \
         LMI_SystemSoftwareCollection
-from openlmi.software.LMI_HostedSoftwareCollection import \
+from lmi.software.LMI_HostedSoftwareCollection import \
         LMI_HostedSoftwareCollection
-from openlmi.software.LMI_MemberOfSoftwareCollection import \
+from lmi.software.LMI_MemberOfSoftwareCollection import \
         LMI_MemberOfSoftwareCollection
-from openlmi.software.LMI_InstalledSoftwareIdentity import \
+from lmi.software.LMI_InstalledSoftwareIdentity import \
         LMI_InstalledSoftwareIdentity
-from openlmi.software.LMI_SoftwareIdentityResource import \
+from lmi.software.LMI_SoftwareIdentityResource import \
         LMI_SoftwareIdentityResource
-from openlmi.software.LMI_ResourceForSoftwareIdentity import \
+from lmi.software.LMI_ResourceForSoftwareIdentity import \
         LMI_ResourceForSoftwareIdentity
-from openlmi.software.LMI_HostedSoftwareIdentityResource import \
+from lmi.software.LMI_HostedSoftwareIdentityResource import \
         LMI_HostedSoftwareIdentityResource
-from openlmi.software.LMI_SoftwareInstallationService import \
+from lmi.software.LMI_SoftwareInstallationService import \
         LMI_SoftwareInstallationService
-from openlmi.software.LMI_SoftwareInstallationServiceCapabilities import \
+from lmi.software.LMI_SoftwareInstallationServiceCapabilities import \
         LMI_SoftwareInstallationServiceCapabilities
-from openlmi.software. \
-        LMI_AssociatedSoftwareInstallationServiceCapabilities import \
-        LMI_AssociatedSoftwareInstallationServiceCapabilities
-from openlmi.software.LMI_HostedSoftwareInstallationService import \
+from lmi.software.LMI_AssociatedSoftwareInstallationServiceCapabilities \
+        import LMI_AssociatedSoftwareInstallationServiceCapabilities
+from lmi.software.LMI_HostedSoftwareInstallationService import \
         LMI_HostedSoftwareInstallationService
-from openlmi.software.LMI_SoftwareInstallationServiceAffectsElement import \
+from lmi.software.LMI_SoftwareInstallationServiceAffectsElement import \
         LMI_SoftwareInstallationServiceAffectsElement
-from openlmi.software.LMI_SoftwareJob import LMI_SoftwareJob
-from openlmi.software.LMI_SoftwareMethodResult import \
-        LMI_SoftwareMethodResult
-from openlmi.software.LMI_AffectedSoftwareJobElement import \
+from lmi.software.LMI_SoftwareJob import LMI_SoftwareJob
+from lmi.software.LMI_SoftwareMethodResult import LMI_SoftwareMethodResult
+from lmi.software.LMI_AffectedSoftwareJobElement import \
         LMI_AffectedSoftwareJobElement
-from openlmi.software.LMI_AssociatedSoftwareJobMethodResult import \
+from lmi.software.LMI_AssociatedSoftwareJobMethodResult import \
         LMI_AssociatedSoftwareJobMethodResult
-from openlmi.software.LMI_OwningSoftwareJobElement import \
+from lmi.software.LMI_OwningSoftwareJobElement import \
         LMI_OwningSoftwareJobElement
-from openlmi.software.LMI_SoftwareIdentityFileCheck import \
+from lmi.software.LMI_SoftwareIdentityFileCheck import \
         LMI_SoftwareIdentityFileCheck
-from openlmi.software.LMI_SoftwareIdentityChecks import \
-        LMI_SoftwareIdentityChecks
-from openlmi.software.yumdb import jobmanager, YumDB
+from lmi.software.LMI_SoftwareIdentityChecks import LMI_SoftwareIdentityChecks
+from lmi.software.yumdb import jobmanager, YumDB
 
 def get_providers(env):
     """
     @return mapping of provider names to corresponding provider instances.
     """
-    cmpi_logging.LogManager.LOGGER_NAME = 'openlmi.software'
+    cmpi_logging.LogManager.LOGGER_NAME = 'lmi.software'
     cmpi_logging.LogManager(env)
 
     # jobmanager does not understand CIM models, give it a way to transform
diff --git a/src/software/openlmi/software/core/AffectedSoftwareJobElement.py b/src/software/lmi/software/core/AffectedSoftwareJobElement.py
index 34c5078..90014eb 100644
--- a/src/software/openlmi/software/core/AffectedSoftwareJobElement.py
+++ b/src/software/lmi/software/core/AffectedSoftwareJobElement.py
@@ -22,15 +22,15 @@ Just a common functionality related to AffectedSoftwareJobElement provider.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
-from openlmi.software import util
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import Identity
-from openlmi.software.core import IdentityFileCheck
-from openlmi.software.core import Job
-from openlmi.software.core import SystemCollection
-from openlmi.software.yumdb import jobs
-from openlmi.software.yumdb import PackageInfo
+from lmi.common import cmpi_logging
+from lmi.software import util
+from lmi.software.core import ComputerSystem
+from lmi.software.core import Identity
+from lmi.software.core import IdentityFileCheck
+from lmi.software.core import Job
+from lmi.software.core import SystemCollection
+from lmi.software.yumdb import jobs
+from lmi.software.yumdb import PackageInfo
 
 class Values(object):
     class ElementEffects(object):
diff --git a/src/software/openlmi/software/core/AssociatedInstallationServiceCapabilities.py b/src/software/lmi/software/core/AssociatedInstallationServiceCapabilities.py
index cb1b24e..cb1b24e 100644
--- a/src/software/openlmi/software/core/AssociatedInstallationServiceCapabilities.py
+++ b/src/software/lmi/software/core/AssociatedInstallationServiceCapabilities.py
diff --git a/src/software/openlmi/software/core/ComputerSystem.py b/src/software/lmi/software/core/ComputerSystem.py
index 48b4500..53c0738 100644
--- a/src/software/openlmi/software/core/ComputerSystem.py
+++ b/src/software/lmi/software/core/ComputerSystem.py
@@ -23,7 +23,7 @@ Just a common functionality related to associated class Linux_ComputerSystem.
 import pywbem
 import socket
 
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 def get_path(prefix='Linux'):
     """
diff --git a/src/software/openlmi/software/core/Error.py b/src/software/lmi/software/core/Error.py
index 92b71d5..d36ebb0 100644
--- a/src/software/openlmi/software/core/Error.py
+++ b/src/software/lmi/software/core/Error.py
@@ -22,7 +22,7 @@ Just a common functionality related to class CIM_Error.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 class Values(object):
     class ErrorSourceFormat(object):
@@ -430,7 +430,7 @@ def make_instance(
             raise TypeError('%s must be integer'%param)
     if error_source is None:
         # this is a cyclic dependency
-        from openlmi.software.core import InstallationService
+        from lmi.software.core import InstallationService
         error_source = InstallationService.get_path()
     if not isinstance(error_source, pywbem.CIMInstanceName):
         raise TypeError('error_source must be a CIMInstanceName')
diff --git a/src/software/openlmi/software/core/Identity.py b/src/software/lmi/software/core/Identity.py
index 9208dcb..2df43a9 100644
--- a/src/software/openlmi/software/core/Identity.py
+++ b/src/software/lmi/software/core/Identity.py
@@ -22,9 +22,9 @@ Just a common functionality related to LMI_SoftwareIdentity provider.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
-from openlmi.software import util
-from openlmi.software.yumdb import PackageInfo, YumDB
+from lmi.common import cmpi_logging
+from lmi.software import util
+from lmi.software.yumdb import PackageInfo, YumDB
 
 class Values(object):
     class DetailedStatus(object):
diff --git a/src/software/openlmi/software/core/IdentityFileCheck.py b/src/software/lmi/software/core/IdentityFileCheck.py
index 30112e8..665d822 100644
--- a/src/software/openlmi/software/core/IdentityFileCheck.py
+++ b/src/software/lmi/software/core/IdentityFileCheck.py
@@ -30,13 +30,13 @@ import pywbem
 import stat
 import yum
 
-from openlmi.common import cmpi_logging
-from openlmi.software import util
-from openlmi.software.yumdb import errors
-from openlmi.software.yumdb import jobs
-from openlmi.software.yumdb import packageinfo
-from openlmi.software.yumdb import packagecheck
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software import util
+from lmi.software.yumdb import errors
+from lmi.software.yumdb import jobs
+from lmi.software.yumdb import packageinfo
+from lmi.software.yumdb import packagecheck
+from lmi.software.yumdb import YumDB
 
 class Values(object):
     class TargetOperatingSystem(object):
diff --git a/src/software/openlmi/software/core/IdentityResource.py b/src/software/lmi/software/core/IdentityResource.py
index cae81df..228015b 100644
--- a/src/software/openlmi/software/core/IdentityResource.py
+++ b/src/software/lmi/software/core/IdentityResource.py
@@ -22,10 +22,10 @@ Just a common functionality related to LMI_SoftwareIdentityResource provider.
 import pywbem
 import socket
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem
-from openlmi.software.yumdb import YumDB
-from openlmi.software.yumdb.repository import Repository
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem
+from lmi.software.yumdb import YumDB
+from lmi.software.yumdb.repository import Repository
 
 class Values(object):
     class DetailedStatus(object):
diff --git a/src/software/openlmi/software/core/InstMethodCall.py b/src/software/lmi/software/core/InstMethodCall.py
index 7fc25db..82b7b1e 100644
--- a/src/software/openlmi/software/core/InstMethodCall.py
+++ b/src/software/lmi/software/core/InstMethodCall.py
@@ -23,10 +23,10 @@ CIM values for enumeration types of CIM_InstMethodCall indication class.
 import pywbem
 import socket
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import Job
-from openlmi.software.core import InstallationService
-from openlmi.software.yumdb import jobs, errors
+from lmi.common import cmpi_logging
+from lmi.software.core import Job
+from lmi.software.core import InstallationService
+from lmi.software.yumdb import jobs, errors
 
 class Values(object):
     class ReturnValueType(object):
diff --git a/src/software/openlmi/software/core/InstallationService.py b/src/software/lmi/software/core/InstallationService.py
index 9eff44e..557f913 100644
--- a/src/software/openlmi/software/core/InstallationService.py
+++ b/src/software/lmi/software/core/InstallationService.py
@@ -23,13 +23,13 @@ provider.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import Identity
-from openlmi.software.core import Job
-from openlmi.software.core import SystemCollection
-from openlmi.software.yumdb import errors
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem
+from lmi.software.core import Identity
+from lmi.software.core import Job
+from lmi.software.core import SystemCollection
+from lmi.software.yumdb import errors
+from lmi.software.yumdb import YumDB
 
 JOB_METHOD_SRC_PARAM_NAMES = ["URI", "Source", "Image", "Source"]
 
diff --git a/src/software/openlmi/software/core/InstallationServiceAffectsElement.py b/src/software/lmi/software/core/InstallationServiceAffectsElement.py
index 93b6c4b..c305468 100644
--- a/src/software/openlmi/software/core/InstallationServiceAffectsElement.py
+++ b/src/software/lmi/software/core/InstallationServiceAffectsElement.py
@@ -23,9 +23,9 @@ LMI_SoftwareInstallationServiceAffectsElement.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import ComputerSystem
-from openlmi.software.core import Identity
+from lmi.common import cmpi_logging
+from lmi.software.core import ComputerSystem
+from lmi.software.core import Identity
 
 class Values(object):
     class ElementEffects(object):
diff --git a/src/software/openlmi/software/core/InstallationServiceCapabilities.py b/src/software/lmi/software/core/InstallationServiceCapabilities.py
index f801790..62209bf 100644
--- a/src/software/openlmi/software/core/InstallationServiceCapabilities.py
+++ b/src/software/lmi/software/core/InstallationServiceCapabilities.py
@@ -23,7 +23,7 @@ LMI_SoftwareInstallationServiceCapabilities provider.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 class Values(object):
     class SupportedExtendedResourceTypes(object):
diff --git a/src/software/openlmi/software/core/Job.py b/src/software/lmi/software/core/Job.py
index 0a3d44a..4a7753a 100644
--- a/src/software/openlmi/software/core/Job.py
+++ b/src/software/lmi/software/core/Job.py
@@ -25,11 +25,11 @@ from datetime import datetime, timedelta
 import pywbem
 import time
 
-from openlmi.common import cmpi_logging
-from openlmi.software import util
-from openlmi.software.core import Error
-from openlmi.software.yumdb import errors, jobs
-from openlmi.software.yumdb import YumDB
+from lmi.common import cmpi_logging
+from lmi.software import util
+from lmi.software.core import Error
+from lmi.software.yumdb import errors, jobs
+from lmi.software.yumdb import YumDB
 
 JOB_CLASS_NAMES = (
     "LMI_SoftwareInstallationJob",
@@ -421,7 +421,7 @@ def get_verification_out_params(job):
         raise TypeError("job must be a YumCheckPackage instance")
     if (   not job.metadata.get("output_params", [])
        and job.state == job.COMPLETED):
-        from openlmi.software.core import IdentityFileCheck
+        from lmi.software.core import IdentityFileCheck
         failed = []
         pkg_info, pkg_check = job.result_data
         for file_name in pkg_check:
diff --git a/src/software/openlmi/software/core/MethodResult.py b/src/software/lmi/software/core/MethodResult.py
index 715a554..47eb7ca 100644
--- a/src/software/openlmi/software/core/MethodResult.py
+++ b/src/software/lmi/software/core/MethodResult.py
@@ -22,10 +22,10 @@ Just a common functionality related to class LMI_SoftwareMethodResult.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
-from openlmi.software.core import Job
-from openlmi.software.core import InstMethodCall
-from openlmi.software.yumdb import jobs, errors, YumDB
+from lmi.common import cmpi_logging
+from lmi.software.core import Job
+from lmi.software.core import InstMethodCall
+from lmi.software.yumdb import jobs, errors, YumDB
 
 @cmpi_logging.trace_function
 def object_path2jobid(op):
diff --git a/src/software/openlmi/software/core/SystemCollection.py b/src/software/lmi/software/core/SystemCollection.py
index d07ecdd..6596d40 100644
--- a/src/software/openlmi/software/core/SystemCollection.py
+++ b/src/software/lmi/software/core/SystemCollection.py
@@ -21,7 +21,7 @@ Common utilities concerning SystemSoftwareCollection provider.
 
 import pywbem
 
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 def get_path():
     """@return instance name with prefilled properties"""
diff --git a/src/software/openlmi/software/core/__init__.py b/src/software/lmi/software/core/__init__.py
index 668e7be..a7ce6c9 100644
--- a/src/software/openlmi/software/core/__init__.py
+++ b/src/software/lmi/software/core/__init__.py
@@ -26,7 +26,7 @@ in this subpackage with the same name except for LMI_ prefix.
 """
 
 import pywbem
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 @cmpi_logging.trace_function
 def generate_references(
diff --git a/src/software/openlmi/software/util/__init__.py b/src/software/lmi/software/util/__init__.py
index d92fd7c..d92fd7c 100644
--- a/src/software/openlmi/software/util/__init__.py
+++ b/src/software/lmi/software/util/__init__.py
diff --git a/src/software/openlmi/software/yumdb/__init__.py b/src/software/lmi/software/yumdb/__init__.py
index 6a79c54..656b090 100644
--- a/src/software/openlmi/software/yumdb/__init__.py
+++ b/src/software/lmi/software/yumdb/__init__.py
@@ -43,17 +43,17 @@ import Queue as TQueue   # T as threaded
 import threading
 import yum
 
-from openlmi.common import cmpi_logging, singletonmixin
-from openlmi.common.IndicationManager import IndicationManager
-from openlmi.software.yumdb import jobs
-from openlmi.software.yumdb import errors
-from openlmi.software.yumdb.packageinfo import PackageInfo
-from openlmi.software.yumdb.packagecheck import PackageFile
-from openlmi.software.yumdb.packagecheck import PackageCheck
-from openlmi.software.yumdb.process import YumWorker
-from openlmi.software.yumdb.repository import Repository
-from openlmi.software.yumdb.util import DispatchingFormatter
-from openlmi.software.util import get_signal_name
+from lmi.common import cmpi_logging, singletonmixin
+from lmi.common.IndicationManager import IndicationManager
+from lmi.software.yumdb import jobs
+from lmi.software.yumdb import errors
+from lmi.software.yumdb.packageinfo import PackageInfo
+from lmi.software.yumdb.packagecheck import PackageFile
+from lmi.software.yumdb.packagecheck import PackageCheck
+from lmi.software.yumdb.process import YumWorker
+from lmi.software.yumdb.repository import Repository
+from lmi.software.yumdb.util import DispatchingFormatter
+from lmi.software.util import get_signal_name
 
 # Maximum time in seconds to wait for a job to accomplish.
 # If timeout expires, spawned process is checked (it might
@@ -70,7 +70,7 @@ YUM_WORKER_DEBUG_LOGGING_CONFIG = {
         "default": {
             "()": DispatchingFormatter,
             "formatters" : {
-                "openlmi.software.yumdb.util.trace_function":
+                "lmi.software.yumdb.util.trace_function":
                     "%(asctime)s %(levelname)s:%(message)s"
                 },
             "default" : "%(asctime)s %(levelname)s:%(module)s:"
@@ -90,7 +90,7 @@ YUM_WORKER_DEBUG_LOGGING_CONFIG = {
             "level": "DEBUG",
             "handlers" : ["file"]
             },
-        "openlmi.software.yumdb": {
+        "lmi.software.yumdb": {
             "level" : "DEBUG",
             "handlers" : ["file"],
             "propagate" : False,
diff --git a/src/software/openlmi/software/yumdb/errors.py b/src/software/lmi/software/yumdb/errors.py
index 44eb1c7..44eb1c7 100644
--- a/src/software/openlmi/software/yumdb/errors.py
+++ b/src/software/lmi/software/yumdb/errors.py
diff --git a/src/software/openlmi/software/yumdb/jobmanager.py b/src/software/lmi/software/yumdb/jobmanager.py
index c2f0202..a224905 100644
--- a/src/software/openlmi/software/yumdb/jobmanager.py
+++ b/src/software/lmi/software/yumdb/jobmanager.py
@@ -39,10 +39,10 @@ import threading
 import time
 import traceback
 
-from openlmi.common.IndicationManager import IndicationManager
-from openlmi.common.JobManager import JobManager as JM
-from openlmi.software.yumdb import errors, jobs
-from openlmi.software.yumdb.util import trace_function
+from lmi.common.IndicationManager import IndicationManager
+from lmi.common.JobManager import JobManager as JM
+from lmi.software.yumdb import errors, jobs
+from lmi.software.yumdb.util import trace_function
 
 # This is a callable, which must be initialized before JobManager is used.
 # It should be a pointer to function, which takes a job and returns
diff --git a/src/software/openlmi/software/yumdb/jobs.py b/src/software/lmi/software/yumdb/jobs.py
index 985c0bc..346ff17 100644
--- a/src/software/openlmi/software/yumdb/jobs.py
+++ b/src/software/lmi/software/yumdb/jobs.py
@@ -28,10 +28,10 @@ import threading
 import time
 import yum
 
-from openlmi.software import util
-from openlmi.software.yumdb import errors
-from openlmi.software.yumdb.packageinfo import PackageInfo
-from openlmi.software.yumdb.repository import Repository
+from lmi.software import util
+from lmi.software.yumdb import errors
+from lmi.software.yumdb.packageinfo import PackageInfo
+from lmi.software.yumdb.repository import Repository
 
 DEFAULT_JOB_PRIORITY = 10
 # in seconds
diff --git a/src/software/openlmi/software/yumdb/packagecheck.py b/src/software/lmi/software/yumdb/packagecheck.py
index 89852b9..e66078c 100644
--- a/src/software/openlmi/software/yumdb/packagecheck.py
+++ b/src/software/lmi/software/yumdb/packagecheck.py
@@ -32,7 +32,7 @@ import pwd
 import rpm
 import yum
 
-from openlmi.software.yumdb import errors
+from lmi.software.yumdb import errors
 
 CHECKSUMTYPE_STR2NUM = dict((val.lower(), k) for (k, val) in
         yum.constants.RPM_CHECKSUM_TYPES.items())
diff --git a/src/software/openlmi/software/yumdb/packageinfo.py b/src/software/lmi/software/yumdb/packageinfo.py
index bfacc5d..7a40d19 100644
--- a/src/software/openlmi/software/yumdb/packageinfo.py
+++ b/src/software/lmi/software/yumdb/packageinfo.py
@@ -26,7 +26,7 @@ Module holding an abstraction for RPM package.
 from datetime import datetime
 import yum
 
-from openlmi.software import util
+from lmi.software import util
 
 class PackageInfo(object):
     """
diff --git a/src/software/openlmi/software/yumdb/process.py b/src/software/lmi/software/yumdb/process.py
index 4e0b262..85abe61 100644
--- a/src/software/openlmi/software/yumdb/process.py
+++ b/src/software/lmi/software/yumdb/process.py
@@ -36,14 +36,14 @@ from urlgrabber.grabber import default_grabber
 import weakref
 import yum
 
-from openlmi.software import util
-from openlmi.software.yumdb import errors
-from openlmi.software.yumdb import jobs
-from openlmi.software.yumdb import packageinfo
-from openlmi.software.yumdb import packagecheck
-from openlmi.software.yumdb import repository
-from openlmi.software.yumdb.jobmanager import JobManager
-from openlmi.software.yumdb.util import trace_function, setup_logging
+from lmi.software import util
+from lmi.software.yumdb import errors
+from lmi.software.yumdb import jobs
+from lmi.software.yumdb import packageinfo
+from lmi.software.yumdb import packagecheck
+from lmi.software.yumdb import repository
+from lmi.software.yumdb.jobmanager import JobManager
+from lmi.software.yumdb.util import trace_function, setup_logging
 
 # *****************************************************************************
 # Constants
@@ -906,7 +906,7 @@ class YumWorker(Process):
 
         # This allows the code, that can be run both from broker and
         # YumWorker, to check, whether it's called by this process.
-        from openlmi.software.yumdb import YumDB
+        from lmi.software.yumdb import YumDB
         YumDB.RUNNING_UNDER_CIMOM_PROCESS = False
 
         self._main_loop()
diff --git a/src/software/openlmi/software/yumdb/repository.py b/src/software/lmi/software/yumdb/repository.py
index 758ae21..758ae21 100644
--- a/src/software/openlmi/software/yumdb/repository.py
+++ b/src/software/lmi/software/yumdb/repository.py
diff --git a/src/software/openlmi/software/yumdb/util.py b/src/software/lmi/software/yumdb/util.py
index a1ab338..18fcf6b 100644
--- a/src/software/openlmi/software/yumdb/util.py
+++ b/src/software/lmi/software/yumdb/util.py
@@ -28,7 +28,7 @@ import inspect
 import logging
 import os
 
-from openlmi.common import cmpi_logging
+from lmi.common import cmpi_logging
 
 class DispatchingFormatter:
     """
@@ -137,7 +137,7 @@ def setup_logging(config):
     """
     try:
         logging.config.dictConfig(config)
-        cmpi_logging.logger = logging.getLogger('openlmi.software.yumdb')
+        cmpi_logging.logger = logging.getLogger('lmi.software.yumdb')
     except Exception:   #pylint: disable=W0703
         # logging is not set up but client expects us to work
         # all messages are dumped to /dev/null
diff --git a/src/software/providers b/src/software/providers
index 6105f87..da87cf3 120000
--- a/src/software/providers
+++ b/src/software/providers
@@ -1 +1 @@
-openlmi/software
\ No newline at end of file
+lmi/software
\ No newline at end of file
diff --git a/src/software/setup.py b/src/software/setup.py
index bede36f..96e8f2b 100644
--- a/src/software/setup.py
+++ b/src/software/setup.py
@@ -1,18 +1,18 @@
 from setuptools import setup
 setup(
-    name='openlmi-software',
+    name='lmi-software',
     description='Software Management providers',
     author='Michal Minar',
     author_email='miminar@redhat.com',
     url='https://fedorahosted.org/openlmi/',
-    version='0.9',
-    namespace_packages=['openlmi'],
+    version='0.9.1',
+    namespace_packages=['lmi'],
     packages=[
-        'openlmi.software',
-        'openlmi.software.core',
-        'openlmi.software.util',
-        'openlmi.software.yumdb'],
-    install_requires=['openlmi'],
+        'lmi.software',
+        'lmi.software.core',
+        'lmi.software.util',
+        'lmi.software.yumdb'],
+    install_requires=['lmi'],
     license="LGPLv2+",
     classifiers=[
         'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
diff --git a/src/software/test/test_software_identity_resource.py b/src/software/test/test_software_identity_resource.py
index 528c6c0..ecdc263 100755
--- a/src/software/test/test_software_identity_resource.py
+++ b/src/software/test/test_software_identity_resource.py
@@ -29,7 +29,7 @@ import socket
 import time
 import unittest
 
-from openlmi.software.core.IdentityResource import Values
+from lmi.software.core.IdentityResource import Values
 import base
 import repository
 import util