diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
index d65c23502b58..3e516537a695 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
@@ -93,7 +93,7 @@ public Message encode() throws InvalidProtocolBufferException {
     final List<MethodArgument> args = new ArrayList<>();
     for (Object argument : arguments) {
       final MethodArgument.Builder argBuilder = MethodArgument.newBuilder();
-      argBuilder.setType(argument.getClass().getCanonicalName());
+      argBuilder.setType(argument.getClass().getName());
       if (argument instanceof GeneratedMessage) {
         argBuilder.setValue(((GeneratedMessage) argument).toByteString());
       } else if (argument instanceof ProtocolMessageEnum) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
index 21ca4be50841..b3ec5436bcd3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
@@ -84,7 +84,7 @@ public static Message encode(final Object result)
 
     final SCMRatisResponseProto response =
         SCMRatisResponseProto.newBuilder()
-            .setType(result.getClass().getCanonicalName())
+            .setType(result.getClass().getName())
             .setValue(value)
         .build();
     return Message.valueOf(