diff --git a/gralloc/QtiGrallocDefs.h b/gralloc/QtiGrallocDefs.h
index dd294267..6ad2213e 100644
--- a/gralloc/QtiGrallocDefs.h
+++ b/gralloc/QtiGrallocDefs.h
@@ -172,9 +172,10 @@
 #define HAL_CSC_ITU_R_601 0
 #define HAL_CSC_ITU_R_601_FR 1
 #define HAL_CSC_ITU_R_709 2
-#define HAL_CSC_ITU_R_709_FR 3
-#define HAL_CSC_ITU_R_2020 4
-#define HAL_CSC_ITU_R_2020_FR 5
+#define HAL_CSC_ITU_R_2020 3
+#define HAL_CSC_ITU_R_2020_FR 4
+#define HAL_CSC_ITU_R_709_FR 5
+
 enum { BUFFER_TYPE_UI = 0, BUFFER_TYPE_VIDEO };
 
 #endif  //__QTIGRALLOCDEFS_H__
diff --git a/gralloc/QtiGrallocMetadata.h b/gralloc/QtiGrallocMetadata.h
index 366e1890..7fecc456 100644
--- a/gralloc/QtiGrallocMetadata.h
+++ b/gralloc/QtiGrallocMetadata.h
@@ -184,14 +184,6 @@ struct qti_ycbcr {
   uint32_t chromaStep;
 };
 
-/* Color Space Macros */
-#define HAL_CSC_ITU_R_601 0
-#define HAL_CSC_ITU_R_601_FR 1
-#define HAL_CSC_ITU_R_709 2
-#define HAL_CSC_ITU_R_709_FR 3
-#define HAL_CSC_ITU_R_2020 4
-#define HAL_CSC_ITU_R_2020_FR 5
-
 #define METADATA_SET_SIZE 512
 
 #define IS_VENDOR_METADATA_TYPE(x) (x >= QTI_VT_TIMESTAMP)
diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 8410b56c..2ca0146f 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -80,9 +80,9 @@ inline int roundUpToPageSize(int x) {
 #define HAL_CSC_ITU_R_601 0
 #define HAL_CSC_ITU_R_601_FR 1
 #define HAL_CSC_ITU_R_709 2
-#define HAL_CSC_ITU_R_709_FR 3
-#define HAL_CSC_ITU_R_2020 4
-#define HAL_CSC_ITU_R_2020_FR 5
+#define HAL_CSC_ITU_R_2020 3
+#define HAL_CSC_ITU_R_2020_FR 4
+#define HAL_CSC_ITU_R_709_FR 5
 
 /* possible formats for 3D content*/
 enum {
diff --git a/libqdmetadata/qdMetaData.h b/libqdmetadata/qdMetaData.h
index 8a9c390f..75163806 100644
--- a/libqdmetadata/qdMetaData.h
+++ b/libqdmetadata/qdMetaData.h
@@ -55,9 +55,9 @@ enum ColorSpace_t {
   ITU_R_601,
   ITU_R_601_FR,
   ITU_R_709,
-  ITU_R_709_FR,
   ITU_R_2020,
   ITU_R_2020_FR,
+  ITU_R_709_FR,
 };
 
 struct BufferDim_t {