6 files changed, 19 insertions, 19 deletions
diff --git a/Kernel/Net/E1000ENetworkAdapter.cpp b/Kernel/Net/E1000ENetworkAdapter.cpp
index f559304238..9f5a43bfdb 100644
--- a/Kernel/Net/E1000ENetworkAdapter.cpp
+++ b/Kernel/Net/E1000ENetworkAdapter.cpp
@@ -182,7 +182,7 @@ static bool is_valid_device_id(u16 device_id)
 
 UNMAP_AFTER_INIT RefPtr<E1000ENetworkAdapter> E1000ENetworkAdapter::try_to_initialize(PCI::Address address)
 {
-    auto id = PCI::get_id(address);
+    auto id = PCI::get_hardware_id(address);
     if (id.vendor_id != PCI::VendorID::Intel)
         return {};
     if (!is_valid_device_id(id.device_id))
diff --git a/Kernel/Net/E1000NetworkAdapter.cpp b/Kernel/Net/E1000NetworkAdapter.cpp
index d562be7bcc..781faa3aa3 100644
--- a/Kernel/Net/E1000NetworkAdapter.cpp
+++ b/Kernel/Net/E1000NetworkAdapter.cpp
@@ -160,7 +160,7 @@ UNMAP_AFTER_INIT static bool is_valid_device_id(u16 device_id)
 
 UNMAP_AFTER_INIT RefPtr<E1000NetworkAdapter> E1000NetworkAdapter::try_to_initialize(PCI::Address address)
 {
-    auto id = PCI::get_id(address);
+    auto id = PCI::get_hardware_id(address);
     if (id.vendor_id != PCI::VendorID::Intel)
         return {};
     if (!is_valid_device_id(id.device_id))
diff --git a/Kernel/Net/NE2000NetworkAdapter.cpp b/Kernel/Net/NE2000NetworkAdapter.cpp
index d7ba71096f..b29ce5b056 100644
--- a/Kernel/Net/NE2000NetworkAdapter.cpp
+++ b/Kernel/Net/NE2000NetworkAdapter.cpp
@@ -140,21 +140,21 @@ struct [[gnu::packed]] received_packet_header {
 UNMAP_AFTER_INIT RefPtr<NE2000NetworkAdapter> NE2000NetworkAdapter::try_to_initialize(PCI::Address address)
 {
     constexpr auto ne2k_ids = Array {
-        PCI::ID { 0x10EC, 0x8029 }, // RealTek RTL-8029(AS)
+        PCI::HardwareID { 0x10EC, 0x8029 }, // RealTek RTL-8029(AS)
 
         // List of clones, taken from Linux's ne2k-pci.c
-        PCI::ID { 0x1050, 0x0940 }, // Winbond 89C940
-        PCI::ID { 0x11f6, 0x1401 }, // Compex RL2000
-        PCI::ID { 0x8e2e, 0x3000 }, // KTI ET32P2
-        PCI::ID { 0x4a14, 0x5000 }, // NetVin NV5000SC
-        PCI::ID { 0x1106, 0x0926 }, // Via 86C926
-        PCI::ID { 0x10bd, 0x0e34 }, // SureCom NE34
-        PCI::ID { 0x1050, 0x5a5a }, // Winbond W89C940F
-        PCI::ID { 0x12c3, 0x0058 }, // Holtek HT80232
-        PCI::ID { 0x12c3, 0x5598 }, // Holtek HT80229
-        PCI::ID { 0x8c4a, 0x1980 }, // Winbond W89C940 (misprogrammed)
+        PCI::HardwareID { 0x1050, 0x0940 }, // Winbond 89C940
+        PCI::HardwareID { 0x11f6, 0x1401 }, // Compex RL2000
+        PCI::HardwareID { 0x8e2e, 0x3000 }, // KTI ET32P2
+        PCI::HardwareID { 0x4a14, 0x5000 }, // NetVin NV5000SC
+        PCI::HardwareID { 0x1106, 0x0926 }, // Via 86C926
+        PCI::HardwareID { 0x10bd, 0x0e34 }, // SureCom NE34
+        PCI::HardwareID { 0x1050, 0x5a5a }, // Winbond W89C940F
+        PCI::HardwareID { 0x12c3, 0x0058 }, // Holtek HT80232
+        PCI::HardwareID { 0x12c3, 0x5598 }, // Holtek HT80229
+        PCI::HardwareID { 0x8c4a, 0x1980 }, // Winbond W89C940 (misprogrammed)
     };
-    auto id = PCI::get_id(address);
+    auto id = PCI::get_hardware_id(address);
     if (!ne2k_ids.span().contains_slow(id))
         return {};
     u8 irq = PCI::get_interrupt_line(address);
diff --git a/Kernel/Net/NetworkingManagement.cpp b/Kernel/Net/NetworkingManagement.cpp
index 92cc562148..bb5e52e380 100644
--- a/Kernel/Net/NetworkingManagement.cpp
+++ b/Kernel/Net/NetworkingManagement.cpp
@@ -91,9 +91,9 @@ UNMAP_AFTER_INIT RefPtr<NetworkAdapter> NetworkingManagement::determine_network_
 bool NetworkingManagement::initialize()
 {
     if (!kernel_command_line().is_physical_networking_disabled()) {
-        PCI::enumerate([&](const PCI::Address& address, PCI::PhysicalID const& physical_id) {
+        PCI::enumerate([&](const PCI::Address& address, PCI::DeviceIdentifier const& device_identifier) {
             // Note: PCI class 2 is the class of Network devices
-            if (physical_id.class_code().value() != 0x02)
+            if (device_identifier.class_code().value() != 0x02)
                 return;
             if (auto adapter = determine_network_device(address); !adapter.is_null())
                 m_adapters.append(adapter.release_nonnull());
diff --git a/Kernel/Net/RTL8139NetworkAdapter.cpp b/Kernel/Net/RTL8139NetworkAdapter.cpp
index c9f9d5e786..00d715f71e 100644
--- a/Kernel/Net/RTL8139NetworkAdapter.cpp
+++ b/Kernel/Net/RTL8139NetworkAdapter.cpp
@@ -114,8 +114,8 @@ namespace Kernel {
 
 UNMAP_AFTER_INIT RefPtr<RTL8139NetworkAdapter> RTL8139NetworkAdapter::try_to_initialize(PCI::Address address)
 {
-    constexpr PCI::ID rtl8139_id = { 0x10EC, 0x8139 };
-    auto id = PCI::get_id(address);
+    constexpr PCI::HardwareID rtl8139_id = { 0x10EC, 0x8139 };
+    auto id = PCI::get_hardware_id(address);
     if (id != rtl8139_id)
         return {};
     u8 irq = PCI::get_interrupt_line(address);
diff --git a/Kernel/Net/RTL8168NetworkAdapter.cpp b/Kernel/Net/RTL8168NetworkAdapter.cpp
index 2408623072..787ce9472f 100644
--- a/Kernel/Net/RTL8168NetworkAdapter.cpp
+++ b/Kernel/Net/RTL8168NetworkAdapter.cpp
@@ -183,7 +183,7 @@ namespace Kernel {
 
 UNMAP_AFTER_INIT RefPtr<RTL8168NetworkAdapter> RTL8168NetworkAdapter::try_to_initialize(PCI::Address address)
 {
-    auto id = PCI::get_id(address);
+    auto id = PCI::get_hardware_id(address);
     if (id.vendor_id != PCI::VendorID::Realtek)
         return {};
     if (id.device_id != 0x8168)