diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/metrics/MonitoredAspect.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/metrics/MonitoredAspect.java
index e089cda61..177f43a68 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/metrics/MonitoredAspect.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/metrics/MonitoredAspect.java
@@ -111,11 +111,6 @@ private void submit(String metricName, long value) {
     }
   }
 
-  private String buildNewMetricBasePath(ProceedingJoinPoint pjp) {
-    String className = clean(pjp.getSignature().getDeclaringTypeName());
-    return new StringBuilder(className).toString();
-  }
-
   private Tags getMetricsTags(String methodName) {
     Tag federationTag = Tag.of("federation_namespace", getMonitorMetastore());
     Tag methodTag = Tag.of("method_name", methodName);
@@ -132,6 +127,11 @@ private String getClassName(ProceedingJoinPoint pjp) {
     return new StringBuilder(className).toString();
   }
 
+  private String buildNewMetricBasePath(ProceedingJoinPoint pjp) {
+    String className = getClassName(pjp);
+    return new StringBuilder(className).toString();
+  }
+
   private String buildMetricBasePath(ProceedingJoinPoint pjp) {
     String className = getClassName(pjp);
     String methodName = getMethodName(pjp);