From 9f3ee178a58a5b65096271a61bb7c91158460378 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Sun, 11 Apr 2021 07:41:09 -0600
Subject: [PATCH] Sync fix naming scheme

---
 OpenCore-Patcher.command                     | 2 +-
 Resources/{build.py => Build-old.py}         | 4 ++--
 Resources/CliMenu.py                         | 2 +-
 Resources/ModelArray.py                      | 8 +++-----
 Resources/SysPatch.py                        | 2 +-
 Resources/{utilities.py => Utilities-old.py} | 0
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename Resources/{build.py => Build-old.py} (99%)
 rename Resources/{utilities.py => Utilities-old.py} (100%)

diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command
index f8bc640ea..b90dd17f1 100755
--- a/OpenCore-Patcher.command
+++ b/OpenCore-Patcher.command
@@ -8,7 +8,7 @@ import sys
 import time
 import platform
 
-from Resources import build, ModelArray, Constants, SysPatch, utilities, CliMenu
+from Resources import Build, ModelArray, Constants, SysPatch, Utilities, CliMenu
 
 
 class OpenCoreLegacyPatcher():
diff --git a/Resources/build.py b/Resources/Build-old.py
similarity index 99%
rename from Resources/build.py
rename to Resources/Build-old.py
index aff6809b8..2246dd126 100644
--- a/Resources/build.py
+++ b/Resources/Build-old.py
@@ -12,7 +12,7 @@ import os
 from pathlib import Path
 from datetime import date
 
-from Resources import Constants, ModelArray, utilities
+from Resources import Constants, ModelArray, Utilities
 
 
 def human_fmt(num):
@@ -103,7 +103,7 @@ class BuildOpenCore:
             self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
             self.get_kext_by_bundle_path("AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext")["Enabled"] = True
 
-            if (self.model in ModelArray.EthernetNvidia) or self.model in ("MacBookAir2,1", "MacBookAir3,1", "MacBookAir3,2"):
+            if self.model in ModelArray.nvidiaHDEF:
                 # Nvidia chipsets all have the same path to ARPT
                 property_path = "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
             elif self.model in ("iMac7,1", "iMac8,1", "MacPro3,1", "MacBookPro4,1"):
diff --git a/Resources/CliMenu.py b/Resources/CliMenu.py
index 0e9314f00..7e8367590 100644
--- a/Resources/CliMenu.py
+++ b/Resources/CliMenu.py
@@ -4,7 +4,7 @@ from __future__ import print_function
 
 import subprocess, sys, time, platform
 
-from Resources import build, ModelArray, Constants, SysPatch, utilities
+from Resources import Build, ModelArray, Constants, SysPatch, Utilities
 
 class MenuOptions:
     def __init__(self, model, versions):
diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py
index 930d15795..ffd949902 100644
--- a/Resources/ModelArray.py
+++ b/Resources/ModelArray.py
@@ -723,14 +723,12 @@ BCM4360Wifi = [
 ]
 
 BCM94331Wifi = [
-    "4331",
-    "4353",
+    "4331",#BCM94331
+    "4353",#BCM943224
 ]
 
 BCM94322Wifi = [
-    "4331",
-	"4353",
-	"432B",
+	"432B",#BCM94322
 ]
 
 BCM94328Wifi = [
diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py
index 3ddabba41..8784f55fb 100644
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -19,7 +19,7 @@ import os
 from pathlib import Path
 from datetime import date
 
-from Resources import Constants, ModelArray, utilities
+from Resources import Constants, ModelArray, Utilities
 
 
 class PatchSysVolume:
diff --git a/Resources/utilities.py b/Resources/Utilities-old.py
similarity index 100%
rename from Resources/utilities.py
rename to Resources/Utilities-old.py