diff --git a/EFI/OC/ACPI/SSDT-BAT.aml b/EFI/OC/ACPI/SSDT-BAT.aml
index 71cb733..f75c4cc 100755
Binary files a/EFI/OC/ACPI/SSDT-BAT.aml and b/EFI/OC/ACPI/SSDT-BAT.aml differ
diff --git a/EFI/OC/ACPI/SSDT-BATC.aml b/EFI/OC/ACPI/SSDT-BATC.aml
index e21c611..aa713f1 100755
Binary files a/EFI/OC/ACPI/SSDT-BATC.aml and b/EFI/OC/ACPI/SSDT-BATC.aml differ
diff --git a/EFI/OC/ACPI/SSDT-EH01.aml b/EFI/OC/ACPI/SSDT-EH01.aml
deleted file mode 100755
index 1392fed..0000000
Binary files a/EFI/OC/ACPI/SSDT-EH01.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-EHC1.aml b/EFI/OC/ACPI/SSDT-EHC1.aml
new file mode 100755
index 0000000..585a1a4
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-EHC1.aml differ
diff --git a/EFI/OC/ACPI/SSDT-PTSWAK.aml b/EFI/OC/ACPI/SSDT-PTSWAK.aml
index 235ffe8..454fffb 100755
Binary files a/EFI/OC/ACPI/SSDT-PTSWAK.aml and b/EFI/OC/ACPI/SSDT-PTSWAK.aml differ
diff --git a/EFI/OC/ACPI/SSDT-XHC.aml b/EFI/OC/ACPI/SSDT-XHC.aml
deleted file mode 100755
index 9ff4c59..0000000
Binary files a/EFI/OC/ACPI/SSDT-XHC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-XHCI.aml b/EFI/OC/ACPI/SSDT-XHCI.aml
new file mode 100755
index 0000000..4f82a01
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-XHCI.aml differ
diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist
index 78e8f1f..4c5e26b 100755
--- a/EFI/OC/Config.plist
+++ b/EFI/OC/Config.plist
@@ -16,19 +16,19 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>EH01</string>
+				<string>EHC1</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-EH01.aml</string>
+				<string>SSDT-EHC1.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>XHC</string>
+				<string>XHCI</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-XHC.aml</string>
+				<string>SSDT-XHCI.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -271,78 +271,6 @@
 				AAAAAA==
 				</data>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>battery BAT0:SBMN to BMNX128</string>
-				<key>Count</key>
-				<integer>0</integer>
-				<key>Enabled</key>
-				<true/>
-				<key>Find</key>
-				<data>
-				U0JNTkA=
-				</data>
-				<key>Limit</key>
-				<integer>0</integer>
-				<key>Mask</key>
-				<data>
-				</data>
-				<key>OemTableId</key>
-				<data>
-				AAAAAAAAAAA=
-				</data>
-				<key>Replace</key>
-				<data>
-				Qk1OWEA=
-				</data>
-				<key>ReplaceMask</key>
-				<data>
-				</data>
-				<key>Skip</key>
-				<integer>0</integer>
-				<key>TableLength</key>
-				<integer>0</integer>
-				<key>TableSignature</key>
-				<data>
-				AAAAAA==
-				</data>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>battery BAT0:SBDN to BDNX128</string>
-				<key>Count</key>
-				<integer>0</integer>
-				<key>Enabled</key>
-				<true/>
-				<key>Find</key>
-				<data>
-				U0JETkA=
-				</data>
-				<key>Limit</key>
-				<integer>0</integer>
-				<key>Mask</key>
-				<data>
-				</data>
-				<key>OemTableId</key>
-				<data>
-				AAAAAAAAAAA=
-				</data>
-				<key>Replace</key>
-				<data>
-				QkROWEA=
-				</data>
-				<key>ReplaceMask</key>
-				<data>
-				</data>
-				<key>Skip</key>
-				<integer>0</integer>
-				<key>TableLength</key>
-				<integer>0</integer>
-				<key>TableSignature</key>
-				<data>
-				AAAAAA==
-				</data>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>batC#1</string>
@@ -595,78 +523,6 @@
 				AAAAAA==
 				</data>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>EHC1 to EH01</string>
-				<key>Count</key>
-				<integer>0</integer>
-				<key>Enabled</key>
-				<true/>
-				<key>Find</key>
-				<data>
-				RUhDMQ==
-				</data>
-				<key>Limit</key>
-				<integer>0</integer>
-				<key>Mask</key>
-				<data>
-				</data>
-				<key>OemTableId</key>
-				<data>
-				AAAAAAAAAAA=
-				</data>
-				<key>Replace</key>
-				<data>
-				RUgwMQ==
-				</data>
-				<key>ReplaceMask</key>
-				<data>
-				</data>
-				<key>Skip</key>
-				<integer>0</integer>
-				<key>TableLength</key>
-				<integer>0</integer>
-				<key>TableSignature</key>
-				<data>
-				AAAAAA==
-				</data>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>XHCI to XHC</string>
-				<key>Count</key>
-				<integer>0</integer>
-				<key>Enabled</key>
-				<true/>
-				<key>Find</key>
-				<data>
-				WEhDSQ==
-				</data>
-				<key>Limit</key>
-				<integer>0</integer>
-				<key>Mask</key>
-				<data>
-				</data>
-				<key>OemTableId</key>
-				<data>
-				AAAAAAAAAAA=
-				</data>
-				<key>Replace</key>
-				<data>
-				WEhDXw==
-				</data>
-				<key>ReplaceMask</key>
-				<data>
-				</data>
-				<key>Skip</key>
-				<integer>0</integer>
-				<key>TableLength</key>
-				<integer>0</integer>
-				<key>TableSignature</key>
-				<data>
-				AAAAAA==
-				</data>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>_PTS to ZPTS(1,N)</string>