diff --git a/src/mainboard/intel/glkrvp/touchpanel.asl b/src/mainboard/intel/glkrvp/touchpanel.asl
index 32503b5272..acbfb20cb6 100644
--- a/src/mainboard/intel/glkrvp/touchpanel.asl
+++ b/src/mainboard/intel/glkrvp/touchpanel.asl
@@ -8,7 +8,7 @@ Scope(\_SB.PCI0.I2C7) {
   Device (TPL1) {
     Name (HID2, 1)
     Name (_HID, "WCOM508E")
-    Name (_CID, "PNP0C50")  // _CID: Compatible ID
+    Name (_CID, "PNP0C50")
     Name (_S0W, 0x04)  // _S0W: S0 Device Wake State
     Name (SBFB, ResourceTemplate () {
       I2cSerialBus (
diff --git a/src/mainboard/starlabs/lite/acpi/touchpad.asl b/src/mainboard/starlabs/lite/acpi/touchpad.asl
index 5c9708df74..2f9c27c72f 100644
--- a/src/mainboard/starlabs/lite/acpi/touchpad.asl
+++ b/src/mainboard/starlabs/lite/acpi/touchpad.asl
@@ -5,7 +5,7 @@ Scope (\_SB.PCI0.I2C7)
 	Device (H02C)
 	{
 		Name (_HID, "STAR0001")
-		Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)	// _CID: Compatible ID
+		Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)
 		Name (_UID, 0x01)						// _UID: Unique ID
 		Name (_DDN, "Touchpad")						// _DDN: DOS Device Name
 		Name (_DEP, Package (0x02)					// _DEP: Dependencies
diff --git a/src/soc/intel/common/block/acpi/acpi/northbridge.asl b/src/soc/intel/common/block/acpi/acpi/northbridge.asl
index b0d0ca8326..65c7588348 100644
--- a/src/soc/intel/common/block/acpi/acpi/northbridge.asl
+++ b/src/soc/intel/common/block/acpi/acpi/northbridge.asl
@@ -4,7 +4,7 @@
 #include <soc/iomap.h>
 
 Name (_HID, EisaId ("PNP0A08") /* PCI Express Bus */)
-Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)  // _CID: Compatible ID
+Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)
 Name (_SEG, 0)  // _SEG: PCI Segment
 Name (_UID, 0)  // _UID: Unique ID
 
diff --git a/src/soc/intel/skylake/acpi/systemagent.asl b/src/soc/intel/skylake/acpi/systemagent.asl
index 9c332c44b8..0fdaab9afb 100644
--- a/src/soc/intel/skylake/acpi/systemagent.asl
+++ b/src/soc/intel/skylake/acpi/systemagent.asl
@@ -4,7 +4,7 @@
 #include <soc/iomap.h>
 
 Name (_HID, EisaId ("PNP0A08") /* PCI Express Bus */)
-Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)  // _CID: Compatible ID
+Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)
 Name (_SEG, 0)  // _SEG: PCI Segment
 Name (_UID, 0)  // _UID: Unique ID