diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf
index c5089e8..ce58a91 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -11,7 +11,7 @@
 IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot"
 IMAGE_FSTYPES += " mtd-ubi-tar"
 
-OBMC_MACHINE_FEATURES += "\
+MACHINE_FEATURES += "\
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-flash-mgmt \
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf
index 7fadd1a..a90e77b 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf
@@ -16,7 +16,7 @@
 
 IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot"
 
-OBMC_MACHINE_FEATURES += "\
+MACHINE_FEATURES += "\
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-flash-mgmt \
diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index 2bcaeaa..935bd99 100644
--- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -11,7 +11,7 @@
 FLASH_SIZE = "32768"
 
 # If we included the openpower.inc we'd get these from that.
-#OBMC_MACHINE_FEATURES += "\
+#MACHINE_FEATURES += "\
 #        obmc-phosphor-fan-mgmt \
 #        obmc-phosphor-chassis-mgmt \
 #        obmc-phosphor-flash-mgmt \