diff --git a/src/mainboard/system76/cfl-h/acpi/buttons.asl b/src/mainboard/system76/cfl-h/acpi/buttons.asl
index 4b5940333e..5afc8aa0b8 100644
--- a/src/mainboard/system76/cfl-h/acpi/buttons.asl
+++ b/src/mainboard/system76/cfl-h/acpi/buttons.asl
@@ -16,11 +16,11 @@
 Device (PWRB)
 {
     Name (_HID, EisaId ("PNP0C0C"))
-    Name (_PRW, Package () { 0x29 /* GPP_D9 */, 3 })
+    Name (_PRW, Package () { 6 /* GPP_K6 */, 3 })
 }
 
 Device (SLPB)
 {
     Name (_HID, EisaId ("PNP0C0E"))
-    Name (_PRW, Package () { 0x29 /* GPP_D9 */, 3 })
+    Name (_PRW, Package () { 6 /* GPP_K6 */, 3 })
 }
diff --git a/src/mainboard/system76/cfl-h/acpi/ec.asl b/src/mainboard/system76/cfl-h/acpi/ec.asl
index ae0796e9ee..22e06b6025 100644
--- a/src/mainboard/system76/cfl-h/acpi/ec.asl
+++ b/src/mainboard/system76/cfl-h/acpi/ec.asl
@@ -16,7 +16,7 @@
 Device (EC0)
 {
     Name (_HID, EisaId ("PNP0C09") /* Embedded Controller Device */)  // _HID: Hardware ID
-    Name (_GPE, 0x50 /* GPP_E16 */)  // _GPE: General Purpose Events
+    Name (_GPE, 3 /* GPP_K3 */)  // _GPE: General Purpose Events
     Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
     {
         IO (Decode16,
diff --git a/src/mainboard/system76/cfl-h/acpi/gpe.asl b/src/mainboard/system76/cfl-h/acpi/gpe.asl
index d24d53ed57..080eb59974 100644
--- a/src/mainboard/system76/cfl-h/acpi/gpe.asl
+++ b/src/mainboard/system76/cfl-h/acpi/gpe.asl
@@ -13,9 +13,9 @@
  * GNU General Public License for more details.
  */
 
-// GPP_D9 SCI
-Method (_L29, 0, Serialized) {
-    Debug = Concatenate("GPE _L29: ", ToHexString(\_SB.PCI0.LPCB.EC0.WFNO))
+// GPP_K6 SWI
+Method (_L06, 0, Serialized) {
+    Debug = Concatenate("GPE _L06: ", ToHexString(\_SB.PCI0.LPCB.EC0.WFNO))
     If (\_SB.PCI0.LPCB.EC0.ECOK) {
         If (\_SB.PCI0.LPCB.EC0.WFNO == One) {
             Notify(\_SB.LID0, 0x80)
diff --git a/src/mainboard/system76/cfl-h/acpi/lid.asl b/src/mainboard/system76/cfl-h/acpi/lid.asl
index 0a8688023a..694da7ffa1 100644
--- a/src/mainboard/system76/cfl-h/acpi/lid.asl
+++ b/src/mainboard/system76/cfl-h/acpi/lid.asl
@@ -16,7 +16,7 @@
 Device (LID0)
 {
     Name (_HID, EisaId ("PNP0C0D"))
-    Name (_PRW, Package () { 0x29 /* GPP_D9 */, 3 })
+    Name (_PRW, Package () { 6 /* GPP_K6 */, 3 })
 
     Method (_LID, 0, NotSerialized) {
         DEBUG = "LID: _LID"