1 files changed, 6 insertions, 6 deletions
diff --git a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
index be68c87..c7b130b 100644
--- a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
+++ b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
@@ -20,7 +20,7 @@
 
 #include <konkret/konkret.h>
 #include "LMI_DiskDriveSAPAvailableForElement.h"
-#include "LMI_Hardware.h"
+#include "utils.h"
 #include "lsblk.h"
 
 static const CMPIBroker* _cb;
@@ -59,7 +59,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances(
     LMI_DiskDriveATAProtocolEndpointRef lmi_hdd_ata_endp;
     LMI_DiskDriveRef lmi_hdd;
     const char *ns = KNameSpace(cop);
-    char name[ELEMENT_NAME_LEN];
+    char name[BUFLEN];
     unsigned i;
     LsblkHdd *lsblk_hdds = NULL;
     unsigned lsblk_hdds_nb = 0;
@@ -81,11 +81,11 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances(
                 lmi_get_system_creation_class_name());
         LMI_DiskDriveRef_Set_SystemName(&lmi_hdd, lmi_get_system_name());
         LMI_DiskDriveRef_Set_CreationClassName(&lmi_hdd,
-                LMI_ORGID "_" DISK_DRIVE_CLASS_NAME);
+                LMI_DiskDrive_ClassName);
         LMI_DiskDriveRef_Set_DeviceID(&lmi_hdd, lsblk_hdds[i].name);
 
-        snprintf(name, ELEMENT_NAME_LEN,
-                "%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME,
+        snprintf(name, BUFLEN,
+                "%s " LMI_DiskDriveATAProtocolEndpoint_ClassName,
                 lsblk_hdds[i].name);
 
         LMI_DiskDriveATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns);
@@ -94,7 +94,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances(
         LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp,
                 lmi_get_system_name());
         LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp,
-                LMI_ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME);
+                LMI_DiskDriveATAProtocolEndpoint_ClassName);
         LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name);
 
         LMI_DiskDriveSAPAvailableForElement_Set_ManagedElement(&lmi_hdd_sap,