amd/agesa,cimx: Rename ACPI OS detection methods

Try to 'standardize' the otherwise peculiar method naming to be somewhat
more in-line with other ACPI implementations. This makes it easier to
compare with vendor DSDT dumps for example.

Change-Id: I5ba54f7361796669ac0cab7ff91e7de43b22e846
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5888
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>

43 files changed, 324 insertions, 324 deletions

diff --git a/src/mainboard/advansus/a785e-i/dsdt.asl b/src/mainboard/advansus/a785e-i/dsdt.asl
index 8cfb7db94a..c6b54920cd 100644
--- a/src/mainboard/advansus/a785e-i/dsdt.asl
+++ b/src/mainboard/advansus/a785e-i/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -410,25 +410,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1375,7 +1375,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1622,7 +1622,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl
index 03a00e028e..7daf35c497 100644
--- a/src/mainboard/amd/bimini_fam10/dsdt.asl
+++ b/src/mainboard/amd/bimini_fam10/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -410,25 +410,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1381,7 +1381,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1628,7 +1628,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/dbm690t/dsdt.asl b/src/mainboard/amd/dbm690t/dsdt.asl
index 32df67325b..78408b5a85 100644
--- a/src/mainboard/amd/dbm690t/dsdt.asl
+++ b/src/mainboard/amd/dbm690t/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -374,25 +374,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1292,7 +1292,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1598,7 +1598,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl
index 49ea44fabf..caa6fee95c 100644
--- a/src/mainboard/amd/inagua/acpi/mainboard.asl
+++ b/src/mainboard/amd/inagua/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl
index 01cb8dd250..9c2dbdffec 100644
--- a/src/mainboard/amd/mahogany/dsdt.asl
+++ b/src/mainboard/amd/mahogany/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -373,25 +373,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1308,7 +1308,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1613,7 +1613,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl
index f55480d509..c7ee70a2c5 100644
--- a/src/mainboard/amd/mahogany_fam10/dsdt.asl
+++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1673,7 +1673,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl
index 40451438c7..05523fb19a 100644
--- a/src/mainboard/amd/olivehill/acpi/mainboard.asl
+++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl
@@ -29,7 +29,7 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl
index 040f0694fe..7631cfc654 100644
--- a/src/mainboard/amd/parmer/acpi/mainboard.asl
+++ b/src/mainboard/amd/parmer/acpi/mainboard.asl
@@ -31,7 +31,7 @@
 	Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 	/* Some global data */
-	Name(OSTP, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
 	Name(PMOD, One) /* Assume APIC */
 
diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl
index 49ea44fabf..caa6fee95c 100644
--- a/src/mainboard/amd/persimmon/acpi/mainboard.asl
+++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/amd/pistachio/dsdt.asl b/src/mainboard/amd/pistachio/dsdt.asl
index 3e5ba54cb5..1f512894a6 100644
--- a/src/mainboard/amd/pistachio/dsdt.asl
+++ b/src/mainboard/amd/pistachio/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -374,25 +374,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1291,7 +1291,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1521,7 +1521,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/serengeti_cheetah/dsdt.asl b/src/mainboard/amd/serengeti_cheetah/dsdt.asl
index da14fe89bf..06c9996e79 100644
--- a/src/mainboard/amd/serengeti_cheetah/dsdt.asl
+++ b/src/mainboard/amd/serengeti_cheetah/dsdt.asl
@@ -89,7 +89,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                         0x0918,,,
                         , TypeStatic)  //0-CF7h
                 })
-                \_SB.OSTP ()
+                \_SB.OSVR ()
                 CreateDWordField (BUF0, 0x3E, VLEN)
                 CreateDWordField (BUF0, 0x36, VMAX)
                 CreateDWordField (BUF0, 0x32, VMIN)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
index 553a6956db..7d7d675556 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
@@ -105,7 +105,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 						0x0918,,,
 						, TypeStatic)	//0-CF7h
 				})
-				\_SB.OSTP ()
+				\_SB.OSVR ()
 				CreateDWordField (BUF0, 0x3E, VLEN)
 				CreateDWordField (BUF0, 0x36, VMAX)
 				CreateDWordField (BUF0, 0x32, VMIN)
diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl
index 49ea44fabf..caa6fee95c 100644
--- a/src/mainboard/amd/south_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/south_station/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl
index 040f0694fe..7631cfc654 100644
--- a/src/mainboard/amd/thatcher/acpi/mainboard.asl
+++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl
@@ -31,7 +31,7 @@
 	Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 	/* Some global data */
-	Name(OSTP, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
 	Name(PMOD, One) /* Assume APIC */
 
diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl
index e6816b0aa0..91d0bc9dfd 100644
--- a/src/mainboard/amd/tilapia_fam10/dsdt.asl
+++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1676,7 +1676,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl
index 49ea44fabf..caa6fee95c 100644
--- a/src/mainboard/amd/union_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/union_station/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
index 1ec881c7e8..1f532cf080 100644
--- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl
+++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
index 40451438c7..05523fb19a 100644
--- a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
@@ -29,7 +29,7 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
index f554bbd10f..a2c3119599 100644
--- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
@@ -31,6 +31,6 @@
 	Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 	/* Some global data */
-	Name(OSTP, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
 	Name(PMOD, One) /* Assume APIC */
diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl
index a844640bd4..ab58dd00d8 100644
--- a/src/mainboard/asus/m4a78-em/dsdt.asl
+++ b/src/mainboard/asus/m4a78-em/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl
index a844640bd4..ab58dd00d8 100644
--- a/src/mainboard/asus/m4a785-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785-m/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl
index 5449d01231..4a56f266cf 100644
--- a/src/mainboard/asus/m4a785t-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785t-m/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1578,7 +1578,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl
index 6e1ccd1eba..8ce2991110 100644
--- a/src/mainboard/asus/m5a88-v/dsdt.asl
+++ b/src/mainboard/asus/m5a88-v/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -410,25 +410,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1381,7 +1381,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1628,7 +1628,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/avalue/eax-785e/dsdt.asl b/src/mainboard/avalue/eax-785e/dsdt.asl
index fa2cc9b2e3..a3696f3c3b 100644
--- a/src/mainboard/avalue/eax-785e/dsdt.asl
+++ b/src/mainboard/avalue/eax-785e/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -410,25 +410,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1375,7 +1375,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1622,7 +1622,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/gigabyte/ma785gm/dsdt.asl b/src/mainboard/gigabyte/ma785gm/dsdt.asl
index faf2171019..cb9de50011 100644
--- a/src/mainboard/gigabyte/ma785gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gm/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/gigabyte/ma785gmt/dsdt.asl b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
index faf2171019..cb9de50011 100644
--- a/src/mainboard/gigabyte/ma785gmt/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/gigabyte/ma78gm/dsdt.asl b/src/mainboard/gigabyte/ma78gm/dsdt.asl
index faf2171019..cb9de50011 100644
--- a/src/mainboard/gigabyte/ma78gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma78gm/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
index 3a2c572905..ce5b10e82e 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
@@ -31,30 +31,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/hp/dl145_g1/dsdt.asl b/src/mainboard/hp/dl145_g1/dsdt.asl
index e8d2a14dd1..05fa6de656 100644
--- a/src/mainboard/hp/dl145_g1/dsdt.asl
+++ b/src/mainboard/hp/dl145_g1/dsdt.asl
@@ -122,7 +122,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
 						0x0918,,,
 						, TypeStatic)  //0-CF7h
 				})
-				\_SB.OSTP ()
+				\_SB.OSVR ()
 				CreateDWordField (BUF0, 0x3E, VLEN)
 				CreateDWordField (BUF0, 0x36, VMAX)
 				CreateDWordField (BUF0, 0x32, VMIN)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 16b6c79a60..2e87c2ca0e 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -31,7 +31,7 @@
 	Name(SSFG, 0x0D)		/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 	/* Some global data */
-	Name(OSTP, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)   /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones) /* Assume nothing */
 	Name(PMOD, One) /* Assume APIC */
 
diff --git a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
index 923a828487..b5a6faf79b 100644
--- a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1673,7 +1673,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/iwill/dk8_htx/dsdt.asl b/src/mainboard/iwill/dk8_htx/dsdt.asl
index da14fe89bf..06c9996e79 100644
--- a/src/mainboard/iwill/dk8_htx/dsdt.asl
+++ b/src/mainboard/iwill/dk8_htx/dsdt.asl
@@ -89,7 +89,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                         0x0918,,,
                         , TypeStatic)  //0-CF7h
                 })
-                \_SB.OSTP ()
+                \_SB.OSVR ()
                 CreateDWordField (BUF0, 0x3E, VLEN)
                 CreateDWordField (BUF0, 0x36, VMAX)
                 CreateDWordField (BUF0, 0x32, VMIN)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index 49ea44fabf..caa6fee95c 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -30,30 +30,30 @@ Name(HPBA, 0xFED00000)	/* Base address of HPET table */
 Name(SSFG, 0x0D)	/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
 
 /* Some global data */
-Name(OSTP, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSVR, 3)	/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 Name(OSV, Ones)	/* Assume nothing */
 Name(PMOD, One)	/* Assume APIC */
 
 Scope(\_SB) {
-	Method(CkOT, 0){
+	Method(OSFL, 0){
 
-		if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 		if(CondRefOf(\_OSI,Local1))
 		{
-			Store(1, OSTP)					/* Assume some form of XP */
+			Store(1, OSVR)					/* Assume some form of XP */
 			if (\_OSI("Windows 2006"))		/* Vista */
 			{
-				Store(2, OSTP)
+				Store(2, OSVR)
 			}
 		} else {
 			If(WCMP(\_OS,"Linux")) {
-				Store(3, OSTP)				/* Linux */
+				Store(3, OSVR)				/* Linux */
 			} Else {
-				Store(4, OSTP)				/* Gotta be WinCE */
+				Store(4, OSVR)				/* Gotta be WinCE */
 			}
 		}
-		Return(OSTP)
+		Return(OSVR)
 	}
 }
 
diff --git a/src/mainboard/jetway/pa78vm5/dsdt.asl b/src/mainboard/jetway/pa78vm5/dsdt.asl
index 848d43e413..2252b165a7 100644
--- a/src/mainboard/jetway/pa78vm5/dsdt.asl
+++ b/src/mainboard/jetway/pa78vm5/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -415,25 +415,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/kontron/kt690/dsdt.asl b/src/mainboard/kontron/kt690/dsdt.asl
index c221e0a1ea..bc3ad1f77f 100644
--- a/src/mainboard/kontron/kt690/dsdt.asl
+++ b/src/mainboard/kontron/kt690/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -374,25 +374,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1292,7 +1292,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1598,7 +1598,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 90d26902a4..bbd3e4f671 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -404,25 +404,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1639,7 +1639,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl
index d377455fd9..3e0fe36d5f 100644
--- a/src/mainboard/lippert/toucan-af/dsdt.asl
+++ b/src/mainboard/lippert/toucan-af/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -404,25 +404,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1638,7 +1638,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/supermicro/h8qgi/dsdt.asl b/src/mainboard/supermicro/h8qgi/dsdt.asl
index b45403e508..6e70bc84d0 100644
--- a/src/mainboard/supermicro/h8qgi/dsdt.asl
+++ b/src/mainboard/supermicro/h8qgi/dsdt.asl
@@ -55,7 +55,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, 0)	/* Default interrupt model is PIC */
 
@@ -458,23 +458,23 @@ DefinitionBlock (
 	}
 
 	Scope(\_SB) {
-		Method(CkOT, 0){
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		Method(OSFL, 0){
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)			/* Assume some form of XP */
+				Store(1, OSVR)			/* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)		/* Linux */
+					Store(3, OSVR)		/* Linux */
 				} Else {
-					Store(4, OSTP)		/* Gotta be WinCE */
+					Store(4, OSVR)		/* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(CIRQ, 0x00, NotSerialized){
@@ -1275,7 +1275,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1594,7 +1594,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
 				 *    	Store(0,\PWDE)
diff --git a/src/mainboard/supermicro/h8scm/dsdt.asl b/src/mainboard/supermicro/h8scm/dsdt.asl
index 5e183753df..88c455b7ab 100644
--- a/src/mainboard/supermicro/h8scm/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm/dsdt.asl
@@ -55,7 +55,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -450,23 +450,23 @@ DefinitionBlock (
 	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
-		Method(CkOT, 0){
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		Method(OSFL, 0){
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)			/* Assume some form of XP */
+				Store(1, OSVR)			/* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)		/* Linux */
+					Store(3, OSVR)		/* Linux */
 				} Else {
-					Store(4, OSTP)		/* Gotta be WinCE */
+					Store(4, OSVR)		/* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1291,7 +1291,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1610,7 +1610,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
 				 *    	Store(0,\PWDE)
diff --git a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
index 13e5620876..d3cf16b122 100644
--- a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -433,25 +433,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1386,7 +1386,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1711,7 +1711,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/technexion/tim5690/dsdt.asl b/src/mainboard/technexion/tim5690/dsdt.asl
index 20fe2d70e4..7cc37daa24 100644
--- a/src/mainboard/technexion/tim5690/dsdt.asl
+++ b/src/mainboard/technexion/tim5690/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -374,25 +374,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1292,7 +1292,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1598,7 +1598,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/technexion/tim8690/dsdt.asl b/src/mainboard/technexion/tim8690/dsdt.asl
index 53be887c50..0968a83efa 100644
--- a/src/mainboard/technexion/tim8690/dsdt.asl
+++ b/src/mainboard/technexion/tim8690/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -374,25 +374,25 @@ DefinitionBlock (
 
 	Scope(\_SB) {
 
-		Method(CkOT, 0){
+		Method(OSFL, 0){
 
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)                /* Assume some form of XP */
+				Store(1, OSVR)                /* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)            /* Linux */
+					Store(3, OSVR)            /* Linux */
 				} Else {
-					Store(4, OSTP)            /* Gotta be WinCE */
+					Store(4, OSVR)            /* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1292,7 +1292,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1598,7 +1598,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/tyan/s8226/dsdt.asl b/src/mainboard/tyan/s8226/dsdt.asl
index 261aa4ee4d..9d4c4fcc2e 100644
--- a/src/mainboard/tyan/s8226/dsdt.asl
+++ b/src/mainboard/tyan/s8226/dsdt.asl
@@ -55,7 +55,7 @@ DefinitionBlock (
 	Name(UOM9, 6)
 
 	/* Some global data */
-	Name(OSTP, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+	Name(OSVR, 3)		/* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
 	Name(OSV, Ones)	/* Assume nothing */
 	Name(PMOD, One)	/* Assume APIC */
 
@@ -450,23 +450,23 @@ DefinitionBlock (
 	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
-		Method(CkOT, 0){
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		Method(OSFL, 0){
+			if(LNotEqual(OSVR, Ones)) {Return(OSVR)}	/* OS version was already detected */
 			if(CondRefOf(\_OSI,Local1))
 			{
-				Store(1, OSTP)			/* Assume some form of XP */
+				Store(1, OSVR)			/* Assume some form of XP */
 				if (\_OSI("Windows 2006"))      /* Vista */
 				{
-					Store(2, OSTP)
+					Store(2, OSVR)
 				}
 			} else {
 				If(WCMP(\_OS,"Linux")) {
-					Store(3, OSTP)		/* Linux */
+					Store(3, OSVR)		/* Linux */
 				} Else {
-					Store(4, OSTP)		/* Gotta be WinCE */
+					Store(4, OSVR)		/* Gotta be WinCE */
 				}
 			}
-			Return(OSTP)
+			Return(OSVR)
 		}
 
 		Method(_PIC, 0x01, NotSerialized)
@@ -1275,7 +1275,7 @@ DefinitionBlock (
 				}
 
 				Method(_INI) {
-					If(LEqual(OSTP,3)){   /* If we are running Linux */
+					If(LEqual(OSVR,3)){   /* If we are running Linux */
 						Store(zero, NSEN)
 						Store(one, NSDO)
 						Store(one, NSDI)
@@ -1594,7 +1594,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
 				 *    	Store(0,\PWDE)