diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c
index 7700c8039..03d224a4a 100644
--- a/src/network/net_3c503.c
+++ b/src/network/net_3c503.c
@@ -692,11 +692,15 @@ static const device_config_t threec503_config[] = {
 };
 
 const device_t threec503_device = {
-    "3Com EtherLink II",
-    "3c503",
-    DEVICE_ISA,
-    0,
-    threec503_nic_init, threec503_nic_close, NULL,
-    { NULL }, NULL, NULL,
-    threec503_config
+    .name = "3Com EtherLink II",
+    .internal_name = "3c503",
+    .flags = DEVICE_ISA,
+    .local = 0,
+    .init = threec503_nic_init,
+    .close = threec503_nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = threec503_config
 };
diff --git a/src/network/net_dp8390.c b/src/network/net_dp8390.c
index 8e9b16f59..7dfcf8c34 100644
--- a/src/network/net_dp8390.c
+++ b/src/network/net_dp8390.c
@@ -1112,9 +1112,15 @@ dp8390_close(void *priv)
 
 
 const device_t dp8390_device = {
-    "DP8390 Network Interface Controller",
-    "dp8390",
-    0, 0,
-    dp8390_init, dp8390_close,
-    NULL, { NULL }, NULL, NULL
+    .name = "DP8390 Network Interface Controller",
+    .internal_name = "dp8390",
+    .flags = 0,
+    .local = 0,
+    .init = dp8390_init,
+    .close = dp8390_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c
index a836d5d8a..1161a5a9c 100644
--- a/src/network/net_ne2000.c
+++ b/src/network/net_ne2000.c
@@ -1226,51 +1226,71 @@ static const device_config_t mca_mac_config[] = {
 // clang-format on
 
 const device_t ne1000_device = {
-    "Novell NE1000",
-    "ne1k",
-    DEVICE_ISA,
-    NE2K_NE1000,
-    nic_init, nic_close, NULL,
-    { NULL }, NULL, NULL,
-    ne1000_config
+    .name = "Novell NE1000",
+    .internal_name = "ne1k",
+    .flags = DEVICE_ISA,
+    .local = NE2K_NE1000,
+    .init = nic_init,
+    .close = nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = ne1000_config
 };
 
 const device_t ne2000_device = {
-    "Novell NE2000",
-    "ne2k",
-    DEVICE_ISA | DEVICE_AT,
-    NE2K_NE2000,
-    nic_init, nic_close, NULL,
-    { NULL }, NULL, NULL,
-    ne2000_config
+    .name = "Novell NE2000",
+    .internal_name = "ne2k",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = NE2K_NE2000,
+    .init = nic_init,
+    .close = nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = ne2000_config
 };
 
 const device_t ethernext_mc_device = {
-    "NetWorth EtherNext/MC",
-    "ethernextmc",
-    DEVICE_MCA,
-    NE2K_ETHERNEXT_MC,
-    nic_init, nic_close, NULL,
-    { NULL }, NULL, NULL,
-    mca_mac_config
+    .name = "NetWorth EtherNext/MC",
+    .internal_name = "ethernextmc",
+    .flags = DEVICE_MCA,
+    .local = NE2K_ETHERNEXT_MC,
+    .init = nic_init,
+    .close = nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = mca_mac_config
 };
 
 const device_t rtl8019as_device = {
-    "Realtek RTL8019AS",
-    "ne2kpnp",
-    DEVICE_ISA | DEVICE_AT,
-    NE2K_RTL8019AS,
-    nic_init, nic_close, NULL,
-    { NULL }, NULL, NULL,
-    rtl8019as_config
+    .name = "Realtek RTL8019AS",
+    .internal_name = "ne2kpnp",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = NE2K_RTL8019AS,
+    .init = nic_init,
+    .close = nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = rtl8019as_config
 };
 
 const device_t rtl8029as_device = {
-    "Realtek RTL8029AS",
-    "ne2kpci",
-    DEVICE_PCI,
-    NE2K_RTL8029AS,
-    nic_init, nic_close, NULL,
-    { NULL }, NULL, NULL,
-    rtl8029as_config
+    .name = "Realtek RTL8029AS",
+    .internal_name = "ne2kpci",
+    .flags = DEVICE_PCI,
+    .local = NE2K_RTL8029AS,
+    .init = nic_init,
+    .close = nic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = rtl8029as_config
 };
diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c
index 17049e2bf..6dd22315d 100644
--- a/src/network/net_pcnet.c
+++ b/src/network/net_pcnet.c
@@ -3144,61 +3144,85 @@ static const device_config_t pcnet_vlb_config[] = {
 // clang-format on
 
 const device_t pcnet_am79c960_device = {
-    "AMD PCnet-ISA",
-    "pcnetisa",
-    DEVICE_AT | DEVICE_ISA,
-    DEV_AM79C960,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_isa_config
+    .name = "AMD PCnet-ISA",
+    .internal_name = "pcnetisa",
+    .flags = DEVICE_AT | DEVICE_ISA,
+    .local = DEV_AM79C960,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_isa_config
 };
 
 const device_t pcnet_am79c960_eb_device = {
-    "Racal Interlan EtherBlaster",
-    "pcnetracal",
-    DEVICE_AT | DEVICE_ISA,
-    DEV_AM79C960_EB,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_isa_config
+    .name = "Racal Interlan EtherBlaster",
+    .internal_name = "pcnetracal",
+    .flags = DEVICE_AT | DEVICE_ISA,
+    .local = DEV_AM79C960_EB,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_isa_config
 };
 
 const device_t pcnet_am79c960_vlb_device = {
-    "AMD PCnet-VL",
-    "pcnetvlb",
-    DEVICE_VLB,
-    DEV_AM79C960_VLB,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_vlb_config
+    .name = "AMD PCnet-VL",
+    .internal_name = "pcnetvlb",
+    .flags = DEVICE_VLB,
+    .local = DEV_AM79C960_VLB,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_vlb_config
 };
 
 const device_t pcnet_am79c961_device = {
-    "AMD PCnet-ISA+",
-    "pcnetisaplus",
-    DEVICE_AT | DEVICE_ISA,
-    DEV_AM79C961,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_pci_config
+    .name = "AMD PCnet-ISA+",
+    .internal_name = "pcnetisaplus",
+    .flags = DEVICE_AT | DEVICE_ISA,
+    .local = DEV_AM79C961,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_pci_config
 };
 
 const device_t pcnet_am79c970a_device = {
-    "AMD PCnet-PCI II",
-    "pcnetpci",
-    DEVICE_PCI,
-    DEV_AM79C970A,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_pci_config
+    .name = "AMD PCnet-PCI II",
+    .internal_name = "pcnetpci",
+    .flags = DEVICE_PCI,
+    .local = DEV_AM79C970A,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_pci_config
 };
 
 const device_t pcnet_am79c973_device = {
-    "AMD PCnet-FAST III",
-    "pcnetfast",
-    DEVICE_PCI,
-    DEV_AM79C973,
-    pcnet_init, pcnet_close, NULL,
-    { NULL }, NULL, NULL,
-    pcnet_pci_config
+    .name = "AMD PCnet-FAST III",
+    .internal_name = "pcnetfast",
+    .flags = DEVICE_PCI,
+    .local = DEV_AM79C973,
+    .init = pcnet_init,
+    .close = pcnet_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = pcnet_pci_config
 };
diff --git a/src/network/net_plip.c b/src/network/net_plip.c
index 528099f9b..e8e7df008 100644
--- a/src/network/net_plip.c
+++ b/src/network/net_plip.c
@@ -504,9 +504,15 @@ const lpt_device_t lpt_plip_device = {
 };
 
 const device_t plip_device = {
-    "Parallel Line Internet Protocol",
-    "plip",
-    DEVICE_LPT, 0,
-    plip_net_init, NULL,
-    NULL, { NULL }, NULL, NULL
+    .name = "Parallel Line Internet Protocol",
+    .internal_name = "plip",
+    .flags = DEVICE_LPT,
+    .local = 0,
+    .init = plip_net_init,
+    .close = NULL,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c
index 90cbdea2e..be6c46905 100644
--- a/src/network/net_wd8003.c
+++ b/src/network/net_wd8003.c
@@ -892,51 +892,71 @@ static const device_config_t mca_mac_config[] = {
 // clang-format on
 
 const device_t wd8003e_device = {
-    "Western Digital WD8003E",
-    "wd8003e",
-    DEVICE_ISA,
-    WD8003E,
-    wd_init, wd_close, NULL,
-    { NULL }, NULL, NULL,
-    wd8003_config
+    .name = "Western Digital WD8003E",
+    .internal_name = "wd8003e",
+    .flags = DEVICE_ISA,
+    .local = WD8003E,
+    .init = wd_init,
+    .close = wd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = wd8003_config
 };
 
 const device_t wd8003eb_device = {
-    "Western Digital WD8003EB",
-    "wd8003eb",
-    DEVICE_ISA,
-    WD8003EB,
-    wd_init, wd_close, NULL,
-    { NULL }, NULL, NULL,
-    wd8003eb_config
+    .name = "Western Digital WD8003EB",
+    .internal_name = "wd8003eb",
+    .flags = DEVICE_ISA,
+    .local = WD8003EB,
+    .init = wd_init,
+    .close = wd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = wd8003eb_config
 };
 
 const device_t wd8013ebt_device = {
-    "Western Digital WD8013EBT",
-    "wd8013ebt",
-    DEVICE_ISA,
-    WD8013EBT,
-    wd_init, wd_close, NULL,
-    { NULL }, NULL, NULL,
-    wd8013_config
+    .name = "Western Digital WD8013EBT",
+    .internal_name = "wd8013ebt",
+    .flags = DEVICE_ISA,
+    .local = WD8013EBT,
+    .init = wd_init,
+    .close = wd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = wd8013_config
 };
 
 const device_t wd8003eta_device = {
-    "Western Digital WD8003ET/A",
-    "wd8003eta",
-    DEVICE_MCA,
-    WD8003ETA,
-    wd_init, wd_close, NULL,
-    { NULL }, NULL, NULL,
-    mca_mac_config
+    .name = "Western Digital WD8003ET/A",
+    .internal_name = "wd8003eta",
+    .flags = DEVICE_MCA,
+    .local = WD8003ETA,
+    .init = wd_init,
+    .close = wd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = mca_mac_config
 };
 
 const device_t wd8003ea_device = {
-    "Western Digital WD8003E/A",
-    "wd8003ea",
-    DEVICE_MCA,
-    WD8003EA,
-    wd_init, wd_close, NULL,
-    { NULL }, NULL, NULL,
-    mca_mac_config
+    .name = "Western Digital WD8003E/A",
+    .internal_name = "wd8003ea",
+    .flags = DEVICE_MCA,
+    .local = WD8003EA,
+    .init = wd_init,
+    .close = wd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = mca_mac_config
 };
diff --git a/src/network/network.c b/src/network/network.c
index ea1ccdf46..a02000372 100644
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -71,12 +71,17 @@
 
 
 static const device_t net_none_device = {
-    "None",
-    "none",
-    0, NET_TYPE_NONE,
-    NULL, NULL, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "None",
+    .internal_name = "none",
+    .flags = 0,
+    .local = NET_TYPE_NONE,
+    .init = NULL,
+    .close = NULL,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };