diff --git a/src/southbridge/amd/pi/avalon/acpi/usb.asl b/src/southbridge/amd/pi/avalon/acpi/usb.asl
index fd0ba6419d..4ec338e88f 100644
--- a/src/southbridge/amd/pi/avalon/acpi/usb.asl
+++ b/src/southbridge/amd/pi/avalon/acpi/usb.asl
@@ -55,7 +55,7 @@ Device(UOH6) {
 	Name(_PRW, Package() {0x0B, 3})
 } /* end UOH5 */
 
-#if !CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE
+#if !CONFIG_SOUTHBRIDGE_AMD_PI_AVALON
 /* 0:14.5 - OHCI */
 Device(UEH1) {
 	Name(_ADR, 0x00140005)
@@ -69,7 +69,7 @@ Device(XHC0) {
 	Name(_PRW, Package() {0x0B, 4})
 } /* end XHC0 */
 
-#if !CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE
+#if !CONFIG_SOUTHBRIDGE_AMD_PI_AVALON
 /* 0:10.1 - XHCI 1*/
 Device(XHC1) {
 	Name(_ADR, 0x00100001)
diff --git a/src/southbridge/amd/pi/avalon/sata.c b/src/southbridge/amd/pi/avalon/sata.c
index 7499370dc5..c02a5b119c 100644
--- a/src/southbridge/amd/pi/avalon/sata.c
+++ b/src/southbridge/amd/pi/avalon/sata.c
@@ -29,7 +29,7 @@
 
 static void sata_init(struct device *dev)
 {
-#if IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE)
+#if IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_PI_AVALON)
 	/**************************************
 	 * Configure the SATA port multiplier *
 	 **************************************/