diff --git a/KHR/khr_df.h b/KHR/khr_df.h
index 9400be3..a443afd 100644
--- a/KHR/khr_df.h
+++ b/KHR/khr_df.h
@@ -312,9 +312,9 @@ typedef enum _khr_df_model_e {
     KHR_DF_MODEL_PVRTC2        = 165U,
     /* UASTC for BASIS supercompression */
     KHR_DF_MODEL_UASTC         = 166U,
-    KHR_DF_MODEL_UASTC_LDR_4X4 = 166U,
-    KHR_DF_MODEL_UASTC_HDR_4X4 = 167U,
-    KHR_DF_MODEL_UASTC_HDR_6X6 = 168U,
+    KHR_DF_MODEL_UASTC_LDR_4x4 = 166U,
+    KHR_DF_MODEL_UASTC_HDR_4x4 = 167U,
+    KHR_DF_MODEL_UASTC_HDR_6x6 = 168U,
     /* Proprietary formats (ATITC, etc.) should follow */
     KHR_DF_MODEL_MAX = 0xFFU
 } khr_df_model_e;
@@ -518,16 +518,16 @@ typedef enum _khr_df_model_channels_e {
     KHR_DF_CHANNEL_UASTC_RRR   = 4U,
     KHR_DF_CHANNEL_UASTC_RRRG  = 5U,
     KHR_DF_CHANNEL_UASTC_RG    = 6U,
-    /* MODEL UASTC_LDR_4X4 (alias) */
-    KHR_DF_CHANNEL_UASTC_LDR_4X4_RGB  = 0U,
-    KHR_DF_CHANNEL_UASTC_LDR_4X4_RGBA = 3U,
-    KHR_DF_CHANNEL_UASTC_LDR_4X4_RRR  = 4U,
-    KHR_DF_CHANNEL_UASTC_LDR_4X4_RRRG = 5U,
-    KHR_DF_CHANNEL_UASTC_LDR_4X4_RG   = 6U,
-    /* MODEL UASTC_4X4_HDR */
-    KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB  = 0U,
-    /* MODEL UASTC_6X6_HDR */
-    KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB  = 0U,
+    /* MODEL UASTC_LDR_4x4 (alias) */
+    KHR_DF_CHANNEL_UASTC_LDR_4x4_RGB  = 0U,
+    KHR_DF_CHANNEL_UASTC_LDR_4x4_RGBA = 3U,
+    KHR_DF_CHANNEL_UASTC_LDR_4x4_RRR  = 4U,
+    KHR_DF_CHANNEL_UASTC_LDR_4x4_RRRG = 5U,
+    KHR_DF_CHANNEL_UASTC_LDR_4x4_RG   = 6U,
+    /* MODEL UASTC_4x4_HDR */
+    KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB  = 0U,
+    /* MODEL UASTC_6x6_HDR */
+    KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB  = 0U,
 
     /* Common channel names shared by multiple formats */
     KHR_DF_CHANNEL_COMMON_LUMA    =  0U,
diff --git a/printdfd.c b/printdfd.c
index 2d872f8..7ae7fa8 100644
--- a/printdfd.c
+++ b/printdfd.c
@@ -262,10 +262,10 @@ const char* dfdToStringColorModel(khr_df_model_e value) {
         return "KHR_DF_MODEL_PVRTC2";
     case KHR_DF_MODEL_UASTC:
         return "KHR_DF_MODEL_UASTC";
-    case KHR_DF_MODEL_UASTC_HDR_4X4:
-        return "KHR_DF_MODEL_UASTC_HDR_4X4";
-    case KHR_DF_MODEL_UASTC_HDR_6X6:
-        return "KHR_DF_MODEL_UASTC_HDR_6X6";
+    case KHR_DF_MODEL_UASTC_HDR_4x4:
+        return "KHR_DF_MODEL_UASTC_HDR_4x4";
+    case KHR_DF_MODEL_UASTC_HDR_6x6:
+        return "KHR_DF_MODEL_UASTC_HDR_6x6";
     case KHR_DF_MODEL_MAX:
         // These enum values are not meant for string representation. Ignore
         break;
@@ -628,18 +628,18 @@ const char* dfdToStringChannelId(khr_df_model_e model, khr_df_model_channels_e v
             return NULL;
         }
 
-    case KHR_DF_MODEL_UASTC_HDR_4X4:
+    case KHR_DF_MODEL_UASTC_HDR_4x4:
         switch (value) {
-        case KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB:
-            return "KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB";
+        case KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB:
+            return "KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB";
         default:
             return NULL;
         }
 
-    case KHR_DF_MODEL_UASTC_HDR_6X6:
+    case KHR_DF_MODEL_UASTC_HDR_6x6:
         switch (value) {
-        case KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB:
-            return "KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB";
+        case KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB:
+            return "KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB";
         default:
             return NULL;
         }