//\r
// Feature Flag is in the form of a global constant\r
//\r
-#define FeaturePcdGet(TokenName) _gPcd_FixedAtBuild_##TokenName\r
+#define FeaturePcdGet(TokenName) _PCD_VALUE_##TokenName\r
\r
\r
//\r
// Fixed is fixed at build time\r
//\r
-#define FixedPcdGet8(TokenName) _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet16(TokenName) _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet32(TokenName) _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet64(TokenName) _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGetBool(TokenName) _gPcd_FixedAtBuild_##TokenName\r
+#define FixedPcdGet8(TokenName) _PCD_VALUE_##TokenName\r
+#define FixedPcdGet16(TokenName) _PCD_VALUE_##TokenName\r
+#define FixedPcdGet32(TokenName) _PCD_VALUE_##TokenName\r
+#define FixedPcdGet64(TokenName) _PCD_VALUE_##TokenName\r
+#define FixedPcdGetBool(TokenName) _PCD_VALUE_##TokenName\r
\r
\r
//\r
// BugBug: This works for strings, but not constants.\r
//\r
-#define FixedPcdGetPtr(TokenName) ((VOID *)_gPcd_FixedAtBuild_##TokenName)\r
+#define FixedPcdGetPtr(TokenName) ((VOID *)_PCD_VALUE_##TokenName)\r
\r
\r
//\r