diff --git a/src/mainboard/51nb/x210/acpi/battery.asl b/src/mainboard/51nb/x210/acpi/battery.asl
index bf5c9b095b..3b126b34a4 100644
--- a/src/mainboard/51nb/x210/acpi/battery.asl
+++ b/src/mainboard/51nb/x210/acpi/battery.asl
@@ -37,19 +37,19 @@ Device (BAT)
 	Method (_BIF, 0, Serialized)
 	{
 		/* Design Capacity */
-		Store (DGCP * 10000 / DGVO, PBIF[1])
+		PBIF[1] = DGCP * 10000 / DGVO
 
 		/* Last Full Charge Capacity */
-		Store (FLCP * 10000 / DGVO, PBIF[2])
+		PBIF[2] = FLCP * 10000 / DGVO
 
 		/* Design Voltage */
-		Store (DGVO, PBIF[4])
+		PBIF[4] = DGVO
 
 		/* Design Capacity of Warning */
-		Store (BDW * 10000 / DGVO, PBIF[5])
+		PBIF[5] = BDW * 10000 / DGVO
 
 		/* Design Capacity of Low */
-		Store (BDL, PBIF[6])
+		PBIF[6] = BDL
 
 		Return (PBIF)
 	}
@@ -70,22 +70,22 @@ Device (BAT)
 		* bit 1 = charging
 		* bit 2 = critical level
 		*/
-		Store (BSTS, PBST[0])
+		PBST[0] = BSTS
 
 		/*
 		* 1: BATTERY PRESENT RATE
 		*/
-		Store (BPR, PBST[1])
+		PBST[1] = BPR
 
 		/*
 		* 2: BATTERY REMAINING CAPACITY
 		*/
-		Store (BRC * 10000 / DGVO, PBST[2])
+		PBST[2] = BRC * 10000 / DGVO
 
 		/*
 		* 3: BATTERY PRESENT VOLTAGE
 		*/
-		Store (BPV, PBST[3])
+		PBST[3] = BPV
 
 		Return (PBST)
 	}
diff --git a/src/mainboard/51nb/x210/acpi/ec.asl b/src/mainboard/51nb/x210/acpi/ec.asl
index 78e156c6a2..581e1e70c1 100644
--- a/src/mainboard/51nb/x210/acpi/ec.asl
+++ b/src/mainboard/51nb/x210/acpi/ec.asl
@@ -45,10 +45,10 @@ Device (EC)
 	Method (_REG, 2, NotSerialized)
 	{
 		/* Initialize AC power state */
-		Store (ACIN, \PWRS)
+		\PWRS = ACIN
 
 		/* Initialize LID switch state */
-		Store (LIDC, \LIDS)
+		\LIDS = LIDC
 	}
 
 	/* KEY_BRIGHTNESSUP */
@@ -72,14 +72,14 @@ Device (EC)
 	/* AC event */
 	Method (_Q0D)
 	{
-		Store (ACIN, \PWRS)
+		\PWRS = ACIN
 		Notify (AC, 0x80)
 	}
 
 	/* Lid event */
 	Method (_Q0E)
 	{
-		Store (LIDC, \LIDS)
+		\LIDS = LIDC
 		Notify (LID0, 0x80)
 	}
 
diff --git a/src/mainboard/51nb/x210/acpi/platform.asl b/src/mainboard/51nb/x210/acpi/platform.asl
index dbf6241a7d..eb1dea8db8 100644
--- a/src/mainboard/51nb/x210/acpi/platform.asl
+++ b/src/mainboard/51nb/x210/acpi/platform.asl
@@ -16,7 +16,7 @@ Method (_PTS, 1)
 
 Method (_WAK, 1)
 {
-	Store(\_SB.PCI0.LPCB.EC.LIDC, \LIDS)
-	Store(\_SB.PCI0.LPCB.EC.ACIN, \PWRS)
+	\LIDS = \_SB.PCI0.LPCB.EC.LIDC
+	\PWRS = \_SB.PCI0.LPCB.EC.ACIN
 	Return (Package (){ 0, 0 })
 }