diff --git a/common/src/main/java/com/amazonaws/services/schemaregistry/common/AWSSchemaNamingStrategy.java b/common/src/main/java/com/amazonaws/services/schemaregistry/common/AWSSchemaNamingStrategy.java
index dc544b92..a6803797 100644
--- a/common/src/main/java/com/amazonaws/services/schemaregistry/common/AWSSchemaNamingStrategy.java
+++ b/common/src/main/java/com/amazonaws/services/schemaregistry/common/AWSSchemaNamingStrategy.java
@@ -28,7 +28,7 @@ default String getSchemaName(String transportName,
     default String getSchemaName(String transportName,
                                  Object data,
                                  boolean isKey) {
-        return isKey ? getSchemaName(transportName) : getSchemaName(transportName, data);
+        return isKey ? getSchemaName(transportName).concat(".key") : getSchemaName(transportName, data);
     }
 
     /**