diff --git a/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java
index 6eb3b73..6006e15 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/TenantIdCodec.java
@@ -40,7 +40,7 @@
         checkNotNull(tenantId, NULL_TENANT_MSG);
 
         ObjectNode result = context.mapper().createObjectNode()
-                .put(TENANT_ID, tenantId.id().toString());
+                .put(TENANT_ID, tenantId.id());
 
         return result;
     }
diff --git a/core/common/src/main/java/org/onosproject/utils/Comparators.java b/core/common/src/main/java/org/onosproject/utils/Comparators.java
index 0f8d7d7..fc81682 100644
--- a/core/common/src/main/java/org/onosproject/utils/Comparators.java
+++ b/core/common/src/main/java/org/onosproject/utils/Comparators.java
@@ -144,7 +144,7 @@
     public static final Comparator<DeviceKey> DEVICE_KEY_COMPARATOR = new Comparator<DeviceKey>() {
         @Override
         public int compare(DeviceKey deviceKey1, DeviceKey deviceKey2) {
-            return deviceKey1.deviceKeyId().id().toString().compareTo(deviceKey2.deviceKeyId().id().toString());
+            return deviceKey1.deviceKeyId().id().compareTo(deviceKey2.deviceKeyId().id());
         }
     };
 
@@ -164,7 +164,7 @@
     public static final Comparator<TenantId> TENANT_ID_COMPARATOR = new Comparator<TenantId>() {
         @Override
         public int compare(TenantId tenant1, TenantId tenant2) {
-            return tenant1.id().toString().compareTo(tenant2.id().toString());
+            return tenant1.id().compareTo(tenant2.id());
         }
     };