mainboard/acpi: Replace constant "Zero" with actual number

Change-Id: I4f2f02623b060ef0ebefc5aceb713c77a8b1e9a6
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71523
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>

34 files changed, 373 insertions, 373 deletions

diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl
index 9b4cffebfa..fa6732c47d 100644
--- a/src/mainboard/google/auron/acpi/thermal.asl
+++ b/src/mainboard/google/auron/acpi/thermal.asl
@@ -133,7 +133,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -160,7 +160,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
index 15a13286db..4f312fa3ca 100644
--- a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
@@ -7,14 +7,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -92,14 +92,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
@@ -109,7 +109,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
index 9a8a4dcf59..cf09518bb2 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -24,14 +24,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -57,9 +57,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -75,14 +75,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
@@ -92,7 +92,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
index 9a8a4dcf59..cf09518bb2 100644
--- a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -24,14 +24,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -57,9 +57,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -75,14 +75,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
@@ -92,7 +92,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
index 519f60fd03..b88116f896 100644
--- a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
@@ -75,14 +75,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
@@ -92,7 +92,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
index 666e11a858..49ca642fe4 100644
--- a/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -40,9 +40,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -92,14 +92,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT8)
@@ -109,14 +109,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT8)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
@@ -126,8 +126,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
@@ -137,8 +137,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP5)
@@ -148,8 +148,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP5)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP6)
@@ -159,7 +159,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP6)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl
index ef93848b26..3463028bbd 100644
--- a/src/mainboard/google/beltino/acpi/thermal.asl
+++ b/src/mainboard/google/beltino/acpi/thermal.asl
@@ -160,7 +160,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -185,7 +185,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -210,7 +210,7 @@ Scope (\_TZ)
 				If (\FLVL <= 2) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -235,7 +235,7 @@ Scope (\_TZ)
 				If (\FLVL <= 3) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -260,7 +260,7 @@ Scope (\_TZ)
 				If (\FLVL <= 4) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/beltino/acpi/usb.asl b/src/mainboard/google/beltino/acpi/usb.asl
index 7cee5acbb3..95d105805e 100644
--- a/src/mainboard/google/beltino/acpi/usb.asl
+++ b/src/mainboard/google/beltino/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -57,9 +57,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -92,8 +92,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP2)
@@ -103,8 +103,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP2)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
@@ -114,8 +114,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
@@ -125,7 +125,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
index 95f2d4391c..02b4db3e9d 100644
--- a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
+++ b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
@@ -17,7 +17,7 @@ Scope (\_SB.PCI0.I2C1)
 			If (Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de"))
 			{
 				// DSM Revision
-				If (Arg2 == Zero)
+				If (Arg2 == 0)
 				{
 					If (Arg1 == 1)
 					{
@@ -48,7 +48,7 @@ Scope (\_SB.PCI0.I2C1)
 				})
 			}
 
-			Return (Zero)
+			Return (0)
 		}
 
 		Method(_CRS, 0x0, NotSerialized)
diff --git a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
index 927476ffea..5988a66bbd 100644
--- a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
@@ -30,7 +30,7 @@ Scope (\_SB)
 
 		Device (EJCT)
 		{
-			Name (_ADR, Zero)
+			Name (_ADR, 0)
 
 			Name (_DSD, Package () {
 				ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -88,7 +88,7 @@ Scope (\_SB.PCI0.I2C2)
 		Method (_DSM, 4, NotSerialized)
 		{
 			If (Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de")) {
-				If (Arg2 == Zero) {
+				If (Arg2 == 0) {
 					/* Function 0 - Query */
 					If (Arg1 == 1) {
 						/* Revision 1 Function 1 */
diff --git a/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl b/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
index b37a411853..221ff04124 100644
--- a/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS01)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS02)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS03)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.HS04)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS04)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.HS05)
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS05)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -92,14 +92,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS07)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SS01)
@@ -109,8 +109,8 @@ Scope (\_SB.PCI0.XHCI.RHUB.SS01)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SS02)
@@ -120,8 +120,8 @@ Scope (\_SB.PCI0.XHCI.RHUB.SS02)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SS03)
@@ -131,8 +131,8 @@ Scope (\_SB.PCI0.XHCI.RHUB.SS03)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SS04)
@@ -142,7 +142,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.SS04)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
index 2f6fd90ec9..d4957f44a4 100644
--- a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
@@ -161,7 +161,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -186,7 +186,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -211,7 +211,7 @@ Scope (\_TZ)
 				If (\FLVL <= 2) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -236,7 +236,7 @@ Scope (\_TZ)
 				If (\FLVL <= 3) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -261,7 +261,7 @@ Scope (\_TZ)
 				If (\FLVL <= 4) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
index 2f6fd90ec9..d4957f44a4 100644
--- a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
@@ -161,7 +161,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -186,7 +186,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -211,7 +211,7 @@ Scope (\_TZ)
 				If (\FLVL <= 2) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -236,7 +236,7 @@ Scope (\_TZ)
 				If (\FLVL <= 3) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -261,7 +261,7 @@ Scope (\_TZ)
 				If (\FLVL <= 4) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
index 2f6fd90ec9..d4957f44a4 100644
--- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
@@ -161,7 +161,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -186,7 +186,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -211,7 +211,7 @@ Scope (\_TZ)
 				If (\FLVL <= 2) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -236,7 +236,7 @@ Scope (\_TZ)
 				If (\FLVL <= 3) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -261,7 +261,7 @@ Scope (\_TZ)
 				If (\FLVL <= 4) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
index 7c3283c46c..4ca9ae2e58 100644
--- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -57,9 +57,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -93,14 +93,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
@@ -110,8 +110,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP3)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
@@ -121,8 +121,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP4)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP5)
@@ -132,8 +132,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP5)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP6)
@@ -143,7 +143,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP6)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
index 4f1746b0cf..6be0181578 100644
--- a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
@@ -269,7 +269,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -294,7 +294,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -319,7 +319,7 @@ Scope (\_TZ)
 				If (\FLVL <= 2) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -344,7 +344,7 @@ Scope (\_TZ)
 				If (\FLVL <= 3) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -369,7 +369,7 @@ Scope (\_TZ)
 				If (\FLVL <= 4) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
index 8a56bc6ce4..f9fa660301 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 /* Wake status package */
-Name (WKST, Package() { Zero, Zero })
+Name (WKST, Package() { 0, 0 })
 
 /*
 * \_PTS - Prepare to Sleep method
diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl
index e2af307af0..df174d3092 100644
--- a/src/mainboard/google/link/acpi/thermal.asl
+++ b/src/mainboard/google/link/acpi/thermal.asl
@@ -158,7 +158,7 @@ Scope (\_TZ)
 				If (\FLVL <= 0) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
@@ -179,7 +179,7 @@ Scope (\_TZ)
 				If (\FLVL <= 1) {
 					Return (1)
 				} Else {
-					Return (Zero)
+					Return (0)
 				}
 			}
 			Method (_ON)  {
diff --git a/src/mainboard/google/parrot/acpi/usb.asl b/src/mainboard/google/parrot/acpi/usb.asl
index 8dd6dbb2d5..2ea63b4a4a 100644
--- a/src/mainboard/google/parrot/acpi/usb.asl
+++ b/src/mainboard/google/parrot/acpi/usb.asl
@@ -7,14 +7,14 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 
 	Device (USB2)
@@ -25,9 +25,9 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 		{
 			0xFF,	// Connectable
-			Zero,	// USB Port
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// USB Port
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Visible
@@ -46,9 +46,9 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 		{
 			0xFF,	// Connectable
-			Zero,	// USB Port
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// USB Port
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Visible
@@ -66,9 +66,9 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 		{
 			0xFF,	// Connectable
-			Zero,	// USB Port
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// USB Port
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Visible
@@ -87,14 +87,14 @@ Scope (_SB.PCI0.EHC2.HUB7.PRT1)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 
 	Device (USB1)
@@ -106,14 +106,14 @@ Scope (_SB.PCI0.EHC2.HUB7.PRT1)
 		{
 			0xFF,	// Connectable
 			0xFF,	// OEM Connector
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Not Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (Zero))
+			Return (GPLD (0))
 		}
 	}
 
@@ -126,14 +126,14 @@ Scope (_SB.PCI0.EHC2.HUB7.PRT1)
 		{
 			0xFF,	// Connectable
 			0xFF,	// OEM Connector
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Not Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (Zero))
+			Return (GPLD (0))
 		}
 	}
 }
diff --git a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
index 4809f26df9..959ec4a2f9 100644
--- a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
@@ -47,7 +47,7 @@ Scope (\_SB.PCI0.I2C3)
 	Device (CAM0)
 	{
 		Name (_HID, "INT3478") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "SONY IMX208 Camera")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
@@ -109,7 +109,7 @@ Scope (\_SB.PCI0.I2C3)
 	Device (NVM0)
 	{
 		Name (_HID, "INT3499") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "GT24C16S")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam0.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam0.asl
index 2d5dd0a289..6ad59f1a0f 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam0.asl
@@ -5,7 +5,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (CAM0)
 	{
 		Name (_HID, "OVTID858")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "OV 13858 Camera") /* _DDN: DOS Device Name */
 		Name (CAMD, 0x02)
 
@@ -92,7 +92,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (VCM0)
 	{
 		Name (_HID, "PRP0001")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Dongwoon AF DAC") /* _DDN: DOS Device Name */
 		Name (CAMD, 0x03)
 
@@ -124,7 +124,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (NVM0)
 	{
 		Name (_HID, "INT3499") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "GT24C16S/CAT24C16")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl
index c41ebca7fe..974f1c4e23 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl
@@ -5,7 +5,7 @@ Scope (\_SB.PCI0.I2C4)
 	Device (CAM1)
 	{
 		Name (_HID, "INT3479") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "OV 5670 Camera")  /* _DDN: DOS Device Name */
 		Name (CAMD, 0x02)
 
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
index d588d575dc..5825d77565 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera_pmic.asl
@@ -5,7 +5,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (PMIC)
 	{
 		Name (_HID, "INT3472") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "TPS68470 PMIC")  /* _DDN: DOS Device Name */
 		Name (CAMD, 0x64)
 
@@ -56,12 +56,12 @@ Scope (\_SB.PCI0.I2C2)
 		}
 
 		/* Marks the availability of all the operation regions */
-		Name (AVBL, Zero)
-		Name (AVGP, Zero)
-		Name (AVB0, Zero)
-		Name (AVB1, Zero)
-		Name (AVB2, Zero)
-		Name (AVB3, Zero)
+		Name (AVBL, 0)
+		Name (AVGP, 0)
+		Name (AVB0, 0)
+		Name (AVB1, 0)
+		Name (AVB2, 0)
+		Name (AVB3, 0)
 		Method (_REG, 2, NotSerialized)
 		{
 			If (Arg0 == 0x08)
@@ -244,7 +244,7 @@ Scope (\_SB.PCI0.I2C2)
 		 * VACT: Analog LDO output
 		 * VDCT: Core buck output
 		 */
-		OperationRegion (PWR1, 0xB0, Zero, 0x0100)
+		OperationRegion (PWR1, 0xB0, 0, 0x0100)
 		Field (PWR1, DWordAcc, NoLock, Preserve)
 		{
 			VSIO, 32,
@@ -264,7 +264,7 @@ Scope (\_SB.PCI0.I2C2)
 		 * ACVA: Analog LDO VR voltage
 		 * DCVA: Core buck VR voltage
 		 */
-		OperationRegion (PWR2, 0xB1, Zero, 0x0100)
+		OperationRegion (PWR2, 0xB1, 0, 0x0100)
 		Field (PWR2, DWordAcc, NoLock, Preserve)
 		{
 			SIOV, 32,
@@ -282,7 +282,7 @@ Scope (\_SB.PCI0.I2C2)
 		 * CFG1: Clock configuration 1 register
 		 * CFG2: Clock configuration 2 register
 		 */
-		OperationRegion (CLKC, 0xB2, Zero, 0x0100)
+		OperationRegion (CLKC, 0xB2, 0, 0x0100)
 		Field (CLKC, DWordAcc, NoLock, Preserve)
 		{
 			PCTL, 32,
@@ -300,7 +300,7 @@ Scope (\_SB.PCI0.I2C2)
 		 * PLDV: PLL feedback divider
 		 * PODV: PLL output divider for HCLK_A
 		 */
-		OperationRegion (CLKF, 0xB3, Zero, 0x0100)
+		OperationRegion (CLKF, 0xB3, 0, 0x0100)
 		Field (CLKF, DWordAcc, NoLock, Preserve)
 		{
 			PDV2, 32,
diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/cam0.asl
index cfc84b5334..8d662ea504 100644
--- a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/cam0.asl
@@ -5,7 +5,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (CAM0)
 	{
 		Name (_HID, "SONY258A")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "SONY IMX258 Camera") /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
@@ -73,7 +73,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (VCM0)
 	{
 		Name (_HID, "PRP0001")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Dongwoon AF DAC") /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
@@ -104,7 +104,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (NVM0)
 	{
 		Name (_HID, "INT3499")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Dongwoon NVM")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl
index c3449a7f66..e5cf437f6b 100644
--- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl
@@ -41,7 +41,7 @@ Scope (\_SB.PCI0.I2C3)
 	Device (CAM0)
 	{
 		Name (_HID, "SONY319A") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Sony IMX319 Camera")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
@@ -104,7 +104,7 @@ Scope (\_SB.PCI0.I2C3)
 	Device (NVM0)
         {
 		Name (_HID, "INT3499") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "M24C64S")  /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl
index 0e31eee538..8337cc5afd 100644
--- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl
+++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl
@@ -40,7 +40,7 @@ Scope (\_SB.PCI0.I2C5)
 	Device (CAM1)
 	{
 		Name (_HID, "SONY355A")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "SONY IMX355A Camera") /* _DDN: DOS Device Name */
 
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
diff --git a/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl b/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
index 5a9e1efa50..e40d435699 100644
--- a/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT1)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -24,14 +24,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 
 	Device (USB1)
@@ -42,9 +42,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 		Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 		{
 			0xFF,	// Connectable
-			Zero,	// USB Port
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// USB Port
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Visible
@@ -63,14 +63,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 		{
 			0xFF,	// Connectable
 			0xFF,	// OEM Connector
-			Zero,	// Reserved
-			Zero	// Reserved
+			0,	// Reserved
+			0	// Reserved
 		})
 
 		// Not Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (Zero))
+			Return (GPLD (0))
 		}
 	}
 }
@@ -81,14 +81,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.PRT4)
@@ -98,14 +98,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SSP1)
@@ -115,7 +115,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl b/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
index 888ca5b841..fd4236753c 100644
--- a/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT1)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 	Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.PRT4)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.SSP1)
@@ -75,7 +75,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/skyrim/variants/winterhold/include/variant/acpi/dtts.asl b/src/mainboard/google/skyrim/variants/winterhold/include/variant/acpi/dtts.asl
index 50a8104376..9bac487cd7 100644
--- a/src/mainboard/google/skyrim/variants/winterhold/include/variant/acpi/dtts.asl
+++ b/src/mainboard/google/skyrim/variants/winterhold/include/variant/acpi/dtts.asl
@@ -22,7 +22,7 @@ Scope (\_SB)
         {
             \_SB.DDEF()
             \_SB.PRTN = 0
-            Return (Zero)
+            Return (0)
         }
 
         If (\_SB.PCI0.LPCB.EC0.STTB == 0) { // Desktop
@@ -35,25 +35,25 @@ Scope (\_SB)
                     If (\_SB.PCI0.LPCB.EC0.TIN4 >= 123) {
                         \_SB.DTTB()
                         \_SB.PRTN = 1
-                        Return (Zero)
+                        Return (0)
                     }
                     // AMB sensor release point
                     If ((\_SB.PCI0.LPCB.EC0.TIN4 <= 118)) {
                         \_SB.DDEF()
                         \_SB.PRTN = 0
-                        Return (Zero)
+                        Return (0)
                     }
                     // Keep tht previous thermal table
-                    Return (Zero)
+                    Return (0)
                 } Else {
                     If (\_SB.PRTN == 3 || \_SB.PRTN == 5) {
                         \_SB.DTTB()
                         \_SB.PRTN = 1
-                        Return (Zero)
+                        Return (0)
                     } Else {
                         \_SB.DDEF()
                         \_SB.PRTN = 0
-                        Return (Zero)
+                        Return (0)
                     }
                 }
             } Else { // Lid-close
@@ -62,24 +62,24 @@ Scope (\_SB)
                     If (\_SB.PCI0.LPCB.EC0.TIN4 >= 128) {
                         \_SB.DTTD()
                         \_SB.PRTN = 3
-                        Return (Zero)
+                        Return (0)
                     }
                     If(\_SB.PCI0.LPCB.EC0.TIN4 <= 123) {
                         \_SB.DTTC()
                         \_SB.PRTN = 2
-                        Return (Zero)
+                        Return (0)
                     }
                     // Keep tht previous thermal table
-                    Return (Zero)
+                    Return (0)
                 } Else {
                     If (\_SB.PRTN == 1 || \_SB.PRTN == 5) {
                         \_SB.DTTD()
                         \_SB.PRTN = 3
-                        Return (Zero)
+                        Return (0)
                     } Else {
                         \_SB.DTTC()
                         \_SB.PRTN = 2
-                        Return (Zero)
+                        Return (0)
                     }
                 }
             }
@@ -90,25 +90,25 @@ Scope (\_SB)
                 If (\_SB.PCI0.LPCB.EC0.TIN4 >= 118) {
                     \_SB.DTTF()
                     \_SB.PRTN = 5
-                    Return (Zero)
+                    Return (0)
                 }
                 // AMB sensor release point
                 If ((\_SB.PCI0.LPCB.EC0.TIN4 <= 113)) {
                     \_SB.DTTE()
                     \_SB.PRTN = 4
-                    Return (Zero)
+                    Return (0)
                 }
                 // Keep tht previous thermal table
-                Return (Zero)
+                Return (0)
             } Else {
                 If (\_SB.PRTN == 1 || \_SB.PRTN == 3) {
                     \_SB.DTTF()
                     \_SB.PRTN = 5
-                    Return (Zero)
+                    Return (0)
                 } Else {
                     \_SB.DTTE()
                     \_SB.PRTN = 4
-                    Return (Zero)
+                    Return (0)
                 }
             }
         } // Desktop/Laptop End
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
index 37e854a354..aaf67bf522 100644
--- a/src/mainboard/google/slippy/dsdt.asl
+++ b/src/mainboard/google/slippy/dsdt.asl
@@ -36,7 +36,7 @@ DefinitionBlock(
 	{
 		Device (WLAN)
 		{
-			Name (_ADR, Zero)
+			Name (_ADR, 0)
 		}
 	}
 
diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
index 15a13286db..4f312fa3ca 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
@@ -7,14 +7,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
@@ -74,9 +74,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -92,14 +92,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
@@ -109,7 +109,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
index 7dff13a3e3..bc2b5bf3b3 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
@@ -6,9 +6,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -23,9 +23,9 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	Name (_UPC, Package (0x04)
 	{
 		0xFF,	// Connectable
-		Zero,	// USB Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// USB Port
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Visible
@@ -41,14 +41,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -58,14 +58,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
@@ -75,14 +75,14 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
 	{
 		0xFF,	// Connectable
 		0xFF,	// OEM Connector
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 
 	// Not Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (Zero))
+		Return (GPLD (0))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
@@ -92,8 +92,8 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP2)
@@ -103,7 +103,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.SSP2)
 	{
 		0xFF,	// Connectable
 		0x03,	// USB 3.0 Port
-		Zero,	// Reserved
-		Zero	// Reserved
+		0,	// Reserved
+		0	// Reserved
 	})
 }
diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
index cb488c23c6..1efd1a2389 100644
--- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
+++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
@@ -76,12 +76,12 @@ Scope (\_SB.PCI0.IPU0)
 			Package (0x02)
 			{
 				"endpoint",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
 				"clock-lanes",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
@@ -100,8 +100,8 @@ Scope (\_SB.PCI0.IPU0)
 				Package (0x03)
 				{
 					^I2C3.CAM0,
-					Zero,
-					Zero
+					0,
+					0
 				}
 			}
 		}
@@ -114,12 +114,12 @@ Scope (\_SB.PCI0.IPU0)
 			Package (0x02)
 			{
 				"endpoint",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
 				"clock-lanes",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
@@ -136,8 +136,8 @@ Scope (\_SB.PCI0.IPU0)
 				Package (0x03)
 				{
 					^I2C2.CAM1,
-					Zero,
-					Zero
+					0,
+					0
 				}
 			}
 		}
@@ -208,7 +208,7 @@ Scope (\_SB.PCI0.I2C3)
 	Device (CAM0)
 	{
 		Name (_HID, "OVTI8856")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Ov 8856 Camera")  /* _DDN: DOS Device Name */
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
 		{
@@ -271,7 +271,7 @@ Scope (\_SB.PCI0.I2C3)
 				Package (0x02)
 				{
 					"port",
-					Zero
+					0
 				}
 			},
 			ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
@@ -292,12 +292,12 @@ Scope (\_SB.PCI0.I2C3)
 				Package (0x02)
 				{
 					"endpoint",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
 					"clock-lanes",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
@@ -325,8 +325,8 @@ Scope (\_SB.PCI0.I2C3)
 					Package (0x03)
 					{
 						IPU0,
-						Zero,
-						Zero
+						0,
+						0
 					}
 				}
 			}
@@ -478,7 +478,7 @@ Scope (\_SB.PCI0.I2C3)
 
 Scope (\_SB.PCI0.I2C2)
 {
-	Name (STA, Zero)
+	Name (STA, 0)
 	PowerResource (FCPR, 0x00, 0x0000)
 	{
 		Method (_ON, 0, Serialized)  /* Front camera_ON_: Power On */
@@ -534,7 +534,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (CAM1)
 	{
 		Name (_HID, "INT3474")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Ov 2740 Camera")  /* _DDN: DOS Device Name */
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
 		{
@@ -589,7 +589,7 @@ Scope (\_SB.PCI0.I2C2)
 				Package (0x02)
 				{
 					"port",
-					Zero
+					0
 				}
 			},
 			ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
@@ -610,12 +610,12 @@ Scope (\_SB.PCI0.I2C2)
 				Package (0x02)
 				{
 					"endpoint",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
 					"clock-lanes",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
@@ -641,7 +641,7 @@ Scope (\_SB.PCI0.I2C2)
 					{
 						IPU0,
 						1,
-						Zero
+						0
 					}
 				}
 			}
diff --git a/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
index b2142b26fd..33c147b7f8 100644
--- a/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
+++ b/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
@@ -76,12 +76,12 @@ Scope (\_SB.PCI0.IPU0)
 			Package (0x02)
 			{
 				"endpoint",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
 				"clock-lanes",
-				Zero
+				0
 			},
 			Package (0x02)
 			{
@@ -98,8 +98,8 @@ Scope (\_SB.PCI0.IPU0)
 				Package (0x03)
 				{
 					^I2C2.CAM1,
-					Zero,
-					Zero
+					0,
+					0
 				}
 			}
 		}
@@ -108,7 +108,7 @@ Scope (\_SB.PCI0.IPU0)
 
 Scope (\_SB.PCI0.I2C2)
 {
-	Name (STA, Zero)
+	Name (STA, 0)
 	PowerResource (FCPR, 0x00, 0x0000)
 	{
 		Method (_ON, 0, Serialized)  /* Front camera_ON_: Power On */
@@ -158,7 +158,7 @@ Scope (\_SB.PCI0.I2C2)
 	Device (CAM1)
 	{
 		Name (_HID, "INT3474")  /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_UID, 0)  /* _UID: Unique ID */
 		Name (_DDN, "Ov 2740 Camera")  /* _DDN: DOS Device Name */
 		Method (_STA, 0, NotSerialized)  /* _STA: Status */
 		{
@@ -213,7 +213,7 @@ Scope (\_SB.PCI0.I2C2)
 				Package (0x02)
 				{
 					"port",
-					Zero
+					0
 				}
 			},
 			ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
@@ -234,12 +234,12 @@ Scope (\_SB.PCI0.I2C2)
 				Package (0x02)
 				{
 					"endpoint",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
 					"clock-lanes",
-					Zero
+					0
 				},
 				Package (0x02)
 				{
@@ -265,7 +265,7 @@ Scope (\_SB.PCI0.I2C2)
 					{
 						IPU0,
 						1,
-						Zero
+						0
 					}
 				}
 			}