diff --git a/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java b/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
index f89fe09..af2a24a 100644
--- a/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
+++ b/src/main/java/org.onosproject.xran/providers/CellDeviceProvider.java
@@ -47,7 +47,7 @@
     private DeviceProviderService providerService;
 
     public CellDeviceProvider() {
-        super(new ProviderId("xran", "org.onosproject.provider.xran"));
+        super(new ProviderId("xran", "org.onosproject.providers.cell"));
     }
 
     @Activate
@@ -101,7 +101,7 @@
 
             Device.Type type = Device.Type.OTHER;
             SparseAnnotations annotations = DefaultAnnotations.builder()
-                    .set(AnnotationKeys.NAME, "eNodeB #" + cell.getEcgi().getEUTRANcellIdentifier())
+                    .set(AnnotationKeys.NAME, "eNodeB " + cell.getEcgi().getEUTRANcellIdentifier())
                     .set(AnnotationKeys.PROTOCOL, "SCTP")
                     .set(AnnotationKeys.CHANNEL_ID, "xxx")
                     .set(AnnotationKeys.MANAGEMENT_ADDRESS, "127.0.0.1")
diff --git a/src/main/java/org.onosproject.xran/providers/UeProvider.java b/src/main/java/org.onosproject.xran/providers/UeProvider.java
index c7a76b9..2205c60 100644
--- a/src/main/java/org.onosproject.xran/providers/UeProvider.java
+++ b/src/main/java/org.onosproject.xran/providers/UeProvider.java
@@ -53,7 +53,7 @@
     private HostProviderService providerService;
 
     public UeProvider() {
-        super(new ProviderId("xran", "org.onosproject.providers.cell"));
+        super(new ProviderId("xran", "org.onosproject.providers.ue"));
     }
 
     @Activate
@@ -87,7 +87,7 @@
             }
 
             if (ue == null) {
-                log.error("UE {} is not found", ue);
+                log.error("UE is not found");
                 return;
             }
 
@@ -97,7 +97,7 @@
                 ecgiSet.forEach(ecgi -> hostLocations.add(new HostLocation(deviceId(uri(ecgi)), PortNumber.portNumber(0), 0)));
 
                 SparseAnnotations annotations = DefaultAnnotations.builder()
-                        .set(AnnotationKeys.NAME, "UE #" + ue.getMmeS1apId())
+                        .set(AnnotationKeys.NAME, "UE " + ue.getMmeS1apId())
                         .build();
 
                 DefaultHostDescription desc = new DefaultHostDescription(