diff --git a/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp b/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp
index 33c49c3..a6ee660 100644
--- a/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp
+++ b/bindings/python/icsneopy/communication/message/filter/messagefilter.cpp
@@ -8,7 +8,7 @@ namespace icsneo {
 
 void init_messagefilter(pybind11::module_& m) {
 	pybind11::class_<MessageFilter, std::shared_ptr<MessageFilter>>(m, "MessageFilter")
-		.def(pybind11::init<Network::NetID>());
+		.def(pybind11::init<Network::_icsneo_netid_t>());
 }
 
 } // namespace icsneo 
diff --git a/bindings/python/icsneopy/communication/network.cpp b/bindings/python/icsneopy/communication/network.cpp
index 2decc05..6ee83dc 100644
--- a/bindings/python/icsneopy/communication/network.cpp
+++ b/bindings/python/icsneopy/communication/network.cpp
@@ -9,165 +9,165 @@ namespace icsneo {
 void init_network(pybind11::module_& m) {
 	pybind11::class_<Network> network(m, "Network");
 
-	pybind11::enum_<Network::NetID>(network, "NetID")
-		.value("Device", Network::NetID::Device)
-		.value("HSCAN", Network::NetID::HSCAN)
-		.value("MSCAN", Network::NetID::MSCAN)
-		.value("SWCAN", Network::NetID::SWCAN)
-		.value("LSFTCAN", Network::NetID::LSFTCAN)
-		.value("FordSCP", Network::NetID::FordSCP)
-		.value("J1708", Network::NetID::J1708)
-		.value("Aux", Network::NetID::Aux)
-		.value("J1850VPW", Network::NetID::J1850VPW)
-		.value("ISO9141", Network::NetID::ISO9141)
-		.value("DiskData", Network::NetID::DiskData)
-		.value("Main51", Network::NetID::Main51)
-		.value("RED", Network::NetID::RED)
-		.value("SCI", Network::NetID::SCI)
-		.value("ISO9141_2", Network::NetID::ISO9141_2)
-		.value("ISO14230", Network::NetID::ISO14230)
-		.value("LIN", Network::NetID::LIN)
-		.value("OP_Ethernet1", Network::NetID::OP_Ethernet1)
-		.value("OP_Ethernet2", Network::NetID::OP_Ethernet2)
-		.value("OP_Ethernet3", Network::NetID::OP_Ethernet3)
-		.value("RED_EXT_MEMORYREAD", Network::NetID::RED_EXT_MEMORYREAD)
-		.value("RED_INT_MEMORYREAD", Network::NetID::RED_INT_MEMORYREAD)
-		.value("RED_DFLASH_READ", Network::NetID::RED_DFLASH_READ)
-		.value("NeoMemorySDRead", Network::NetID::NeoMemorySDRead)
-		.value("CAN_ERRBITS", Network::NetID::CAN_ERRBITS)
-		.value("NeoMemoryWriteDone", Network::NetID::NeoMemoryWriteDone)
-		.value("RED_WAVE_CAN1_LOGICAL", Network::NetID::RED_WAVE_CAN1_LOGICAL)
-		.value("RED_WAVE_CAN2_LOGICAL", Network::NetID::RED_WAVE_CAN2_LOGICAL)
-		.value("RED_WAVE_LIN1_LOGICAL", Network::NetID::RED_WAVE_LIN1_LOGICAL)
-		.value("RED_WAVE_LIN2_LOGICAL", Network::NetID::RED_WAVE_LIN2_LOGICAL)
-		.value("RED_WAVE_LIN1_ANALOG", Network::NetID::RED_WAVE_LIN1_ANALOG)
-		.value("RED_WAVE_LIN2_ANALOG", Network::NetID::RED_WAVE_LIN2_ANALOG)
-		.value("RED_WAVE_MISC_ANALOG", Network::NetID::RED_WAVE_MISC_ANALOG)
-		.value("RED_WAVE_MISCDIO2_LOGICAL", Network::NetID::RED_WAVE_MISCDIO2_LOGICAL)
-		.value("RED_NETWORK_COM_ENABLE_EX", Network::NetID::RED_NETWORK_COM_ENABLE_EX)
-		.value("RED_NEOVI_NETWORK", Network::NetID::RED_NEOVI_NETWORK)
-		.value("RED_READ_BAUD_SETTINGS", Network::NetID::RED_READ_BAUD_SETTINGS)
-		.value("RED_OLDFORMAT", Network::NetID::RED_OLDFORMAT)
-		.value("RED_SCOPE_CAPTURE", Network::NetID::RED_SCOPE_CAPTURE)
-		.value("RED_HARDWARE_EXCEP", Network::NetID::RED_HARDWARE_EXCEP)
-		.value("RED_GET_RTC", Network::NetID::RED_GET_RTC)
-		.value("ISO9141_3", Network::NetID::ISO9141_3)
-		.value("HSCAN2", Network::NetID::HSCAN2)
-		.value("HSCAN3", Network::NetID::HSCAN3)
-		.value("OP_Ethernet4", Network::NetID::OP_Ethernet4)
-		.value("OP_Ethernet5", Network::NetID::OP_Ethernet5)
-		.value("ISO9141_4", Network::NetID::ISO9141_4)
-		.value("LIN2", Network::NetID::LIN2)
-		.value("LIN3", Network::NetID::LIN3)
-		.value("LIN4", Network::NetID::LIN4)
-		.value("RED_App_Error", Network::NetID::RED_App_Error)
-		.value("CGI", Network::NetID::CGI)
-		.value("Reset_Status", Network::NetID::Reset_Status)
-		.value("FB_Status", Network::NetID::FB_Status)
-		.value("App_Signal_Status", Network::NetID::App_Signal_Status)
-		.value("Read_Datalink_Cm_Tx_Msg", Network::NetID::Read_Datalink_Cm_Tx_Msg)
-		.value("Read_Datalink_Cm_Rx_Msg", Network::NetID::Read_Datalink_Cm_Rx_Msg)
-		.value("Logging_Overflow", Network::NetID::Logging_Overflow)
-		.value("ReadSettings", Network::NetID::ReadSettings)
-		.value("HSCAN4", Network::NetID::HSCAN4)
-		.value("HSCAN5", Network::NetID::HSCAN5)
-		.value("RS232", Network::NetID::RS232)
-		.value("UART", Network::NetID::UART)
-		.value("UART2", Network::NetID::UART2)
-		.value("UART3", Network::NetID::UART3)
-		.value("UART4", Network::NetID::UART4)
-		.value("SWCAN2", Network::NetID::SWCAN2)
-		.value("Ethernet_DAQ", Network::NetID::Ethernet_DAQ)
-		.value("Data_To_Host", Network::NetID::Data_To_Host)
-		.value("TextAPI_To_Host", Network::NetID::TextAPI_To_Host)
-		.value("SPI1", Network::NetID::SPI1)
-		.value("OP_Ethernet6", Network::NetID::OP_Ethernet6)
-		.value("Red_VBat", Network::NetID::Red_VBat)
-		.value("OP_Ethernet7", Network::NetID::OP_Ethernet7)
-		.value("OP_Ethernet8", Network::NetID::OP_Ethernet8)
-		.value("OP_Ethernet9", Network::NetID::OP_Ethernet9)
-		.value("OP_Ethernet10", Network::NetID::OP_Ethernet10)
-		.value("OP_Ethernet11", Network::NetID::OP_Ethernet11)
-		.value("FlexRay1a", Network::NetID::FlexRay1a)
-		.value("FlexRay1b", Network::NetID::FlexRay1b)
-		.value("FlexRay2a", Network::NetID::FlexRay2a)
-		.value("FlexRay2b", Network::NetID::FlexRay2b)
-		.value("LIN5", Network::NetID::LIN5)
-		.value("FlexRay", Network::NetID::FlexRay)
-		.value("FlexRay2", Network::NetID::FlexRay2)
-		.value("OP_Ethernet12", Network::NetID::OP_Ethernet12)
-		.value("I2C", Network::NetID::I2C)
-		.value("MOST25", Network::NetID::MOST25)
-		.value("MOST50", Network::NetID::MOST50)
-		.value("MOST150", Network::NetID::MOST150)
-		.value("Ethernet", Network::NetID::Ethernet)
-		.value("GMFSA", Network::NetID::GMFSA)
-		.value("TCP", Network::NetID::TCP)
-		.value("HSCAN6", Network::NetID::HSCAN6)
-		.value("HSCAN7", Network::NetID::HSCAN7)
-		.value("LIN6", Network::NetID::LIN6)
-		.value("LSFTCAN2", Network::NetID::LSFTCAN2)
-		.value("LogicalDiskInfo", Network::NetID::LogicalDiskInfo)
-		.value("WiVICommand", Network::NetID::WiVICommand)
-		.value("ScriptStatus", Network::NetID::ScriptStatus)
-		.value("EthPHYControl", Network::NetID::EthPHYControl)
-		.value("ExtendedCommand", Network::NetID::ExtendedCommand)
-		.value("ExtendedData", Network::NetID::ExtendedData)
-		.value("FlexRayControl", Network::NetID::FlexRayControl)
-		.value("CoreMiniPreLoad", Network::NetID::CoreMiniPreLoad)
-		.value("HW_COM_Latency_Test", Network::NetID::HW_COM_Latency_Test)
-		.value("DeviceStatus", Network::NetID::DeviceStatus)
-		.value("UDP", Network::NetID::UDP)
-		.value("ForwardedMessage", Network::NetID::ForwardedMessage)
-		.value("I2C2", Network::NetID::I2C2)
-		.value("I2C3", Network::NetID::I2C3)
-		.value("I2C4", Network::NetID::I2C4)
-		.value("Ethernet2", Network::NetID::Ethernet2)
-		.value("A2B1", Network::NetID::A2B1)
-		.value("A2B2", Network::NetID::A2B2)
-		.value("Ethernet3", Network::NetID::Ethernet3)
-		.value("WBMS", Network::NetID::WBMS)
-		.value("DWCAN9", Network::NetID::DWCAN9)
-		.value("DWCAN10", Network::NetID::DWCAN10)
-		.value("DWCAN11", Network::NetID::DWCAN11)
-		.value("DWCAN12", Network::NetID::DWCAN12)
-		.value("DWCAN13", Network::NetID::DWCAN13)
-		.value("DWCAN14", Network::NetID::DWCAN14)
-		.value("DWCAN15", Network::NetID::DWCAN15)
-		.value("DWCAN16", Network::NetID::DWCAN16)
-		.value("LIN7", Network::NetID::LIN7)
-		.value("LIN8", Network::NetID::LIN8)
-		.value("SPI2", Network::NetID::SPI2)
-		.value("MDIO1", Network::NetID::MDIO1)
-		.value("MDIO2", Network::NetID::MDIO2)
-		.value("MDIO3", Network::NetID::MDIO3)
-		.value("MDIO4", Network::NetID::MDIO4)
-		.value("MDIO5", Network::NetID::MDIO5)
-		.value("MDIO6", Network::NetID::MDIO6)
-		.value("MDIO7", Network::NetID::MDIO7)
-		.value("MDIO8", Network::NetID::MDIO8)
-		.value("OP_Ethernet13", Network::NetID::OP_Ethernet13)
-		.value("OP_Ethernet14", Network::NetID::OP_Ethernet14)
-		.value("OP_Ethernet15", Network::NetID::OP_Ethernet15)
-		.value("OP_Ethernet16", Network::NetID::OP_Ethernet16)
-		.value("SPI3", Network::NetID::SPI3)
-		.value("SPI4", Network::NetID::SPI4)
-		.value("SPI5", Network::NetID::SPI5)
-		.value("SPI6", Network::NetID::SPI6)
-		.value("SPI7", Network::NetID::SPI7)
-		.value("SPI8", Network::NetID::SPI8)
-		.value("LIN9", Network::NetID::LIN9)
-		.value("LIN10", Network::NetID::LIN10)
-		.value("LIN11", Network::NetID::LIN11)
-		.value("LIN12", Network::NetID::LIN12)
-		.value("LIN13", Network::NetID::LIN13)
-		.value("LIN14", Network::NetID::LIN14)
-		.value("LIN15", Network::NetID::LIN15)
-		.value("LIN16", Network::NetID::LIN16)
-		.value("Any", Network::NetID::Any)
-		.value("Invalid", Network::NetID::Invalid);
+	pybind11::enum_<Network::_icsneo_netid_t>(network, "_icsneo_netid_t")
+		.value("Device", Network::_icsneo_netid_t::icsneo_netid_device)
+		.value("HSCAN", Network::_icsneo_netid_t::icsneo_netid_hscan)
+		.value("MSCAN", Network::_icsneo_netid_t::icsneo_netid_mscan)
+		.value("SWCAN", Network::_icsneo_netid_t::icsneo_netid_swcan)
+		.value("LSFTCAN", Network::_icsneo_netid_t::icsneo_netid_lsftcan)
+		.value("FordSCP", Network::_icsneo_netid_t::icsneo_netid_fordscp)
+		.value("J1708", Network::_icsneo_netid_t::icsneo_netid_j1708)
+		.value("Aux", Network::_icsneo_netid_t::icsneo_netid_aux)
+		.value("J1850VPW", Network::_icsneo_netid_t::icsneo_netid_j1850vpw)
+		.value("ISO9141", Network::_icsneo_netid_t::icsneo_netid_iso9141)
+		.value("DiskData", Network::_icsneo_netid_t::icsneo_netid_disk_data)
+		.value("Main51", Network::_icsneo_netid_t::icsneo_netid_main51)
+		.value("RED", Network::_icsneo_netid_t::icsneo_netid_red)
+		.value("SCI", Network::_icsneo_netid_t::icsneo_netid_sci)
+		.value("ISO9141_2", Network::_icsneo_netid_t::icsneo_netid_iso9141_2)
+		.value("ISO14230", Network::_icsneo_netid_t::icsneo_netid_iso14230)
+		.value("LIN", Network::_icsneo_netid_t::icsneo_netid_lin)
+		.value("OP_Ethernet1", Network::_icsneo_netid_t::icsneo_netid_op_ethernet1)
+		.value("OP_Ethernet2", Network::_icsneo_netid_t::icsneo_netid_op_ethernet2)
+		.value("OP_Ethernet3", Network::_icsneo_netid_t::icsneo_netid_op_ethernet3)
+		.value("RED_EXT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_ext_memoryread)
+		.value("RED_INT_MEMORYREAD", Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread)
+		.value("RED_DFLASH_READ", Network::_icsneo_netid_t::icsneo_netid_red_dflash_read)
+		.value("NeoMemorySDRead", Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread)
+		.value("CAN_ERRBITS", Network::_icsneo_netid_t::icsneo_netid_can_errbits)
+		.value("NeoMemoryWriteDone", Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done)
+		.value("RED_WAVE_CAN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can1_logical)
+		.value("RED_WAVE_CAN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_can2_logical)
+		.value("RED_WAVE_LIN1_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_logical)
+		.value("RED_WAVE_LIN2_LOGICAL", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_logical)
+		.value("RED_WAVE_LIN1_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin1_analog)
+		.value("RED_WAVE_LIN2_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_lin2_analog)
+		.value("RED_WAVE_MISC_ANALOG", Network::_icsneo_netid_t::icsneo_netid_red_wave_misc_analog)
+		.value("RED_WAVE_MISCDIO2_LOGICAL", Network::_icsneo_netid_t::RED_WAVE_MISCDIO2_LOGICAL)
+		.value("RED_NETWORK_COM_ENABLE_EX", Network::_icsneo_netid_t::RED_NETWORK_COM_ENABLE_EX)
+		.value("RED_NEOVI_NETWORK", Network::_icsneo_netid_t::RED_NEOVI_NETWORK)
+		.value("RED_READ_BAUD_SETTINGS", Network::_icsneo_netid_t::RED_READ_BAUD_SETTINGS)
+		.value("RED_OLDFORMAT", Network::_icsneo_netid_t::RED_OLDFORMAT)
+		.value("RED_SCOPE_CAPTURE", Network::_icsneo_netid_t::RED_SCOPE_CAPTURE)
+		.value("RED_HARDWARE_EXCEP", Network::_icsneo_netid_t::RED_HARDWARE_EXCEP)
+		.value("RED_GET_RTC", Network::_icsneo_netid_t::RED_GET_RTC)
+		.value("ISO9141_3", Network::_icsneo_netid_t::ISO9141_3)
+		.value("HSCAN2", Network::_icsneo_netid_t::HSCAN2)
+		.value("HSCAN3", Network::_icsneo_netid_t::HSCAN3)
+		.value("OP_Ethernet4", Network::_icsneo_netid_t::OP_Ethernet4)
+		.value("OP_Ethernet5", Network::_icsneo_netid_t::OP_Ethernet5)
+		.value("ISO9141_4", Network::_icsneo_netid_t::ISO9141_4)
+		.value("LIN2", Network::_icsneo_netid_t::LIN2)
+		.value("LIN3", Network::_icsneo_netid_t::LIN3)
+		.value("LIN4", Network::_icsneo_netid_t::LIN4)
+		.value("RED_App_Error", Network::_icsneo_netid_t::RED_App_Error)
+		.value("CGI", Network::_icsneo_netid_t::CGI)
+		.value("Reset_Status", Network::_icsneo_netid_t::Reset_Status)
+		.value("FB_Status", Network::_icsneo_netid_t::FB_Status)
+		.value("App_Signal_Status", Network::_icsneo_netid_t::App_Signal_Status)
+		.value("Read_Datalink_Cm_Tx_Msg", Network::_icsneo_netid_t::Read_Datalink_Cm_Tx_Msg)
+		.value("Read_Datalink_Cm_Rx_Msg", Network::_icsneo_netid_t::Read_Datalink_Cm_Rx_Msg)
+		.value("Logging_Overflow", Network::_icsneo_netid_t::Logging_Overflow)
+		.value("ReadSettings", Network::_icsneo_netid_t::ReadSettings)
+		.value("HSCAN4", Network::_icsneo_netid_t::HSCAN4)
+		.value("HSCAN5", Network::_icsneo_netid_t::HSCAN5)
+		.value("RS232", Network::_icsneo_netid_t::RS232)
+		.value("UART", Network::_icsneo_netid_t::UART)
+		.value("UART2", Network::_icsneo_netid_t::UART2)
+		.value("UART3", Network::_icsneo_netid_t::UART3)
+		.value("UART4", Network::_icsneo_netid_t::UART4)
+		.value("SWCAN2", Network::_icsneo_netid_t::SWCAN2)
+		.value("Ethernet_DAQ", Network::_icsneo_netid_t::Ethernet_DAQ)
+		.value("Data_To_Host", Network::_icsneo_netid_t::Data_To_Host)
+		.value("TextAPI_To_Host", Network::_icsneo_netid_t::TextAPI_To_Host)
+		.value("SPI1", Network::_icsneo_netid_t::SPI1)
+		.value("OP_Ethernet6", Network::_icsneo_netid_t::OP_Ethernet6)
+		.value("Red_VBat", Network::_icsneo_netid_t::Red_VBat)
+		.value("OP_Ethernet7", Network::_icsneo_netid_t::OP_Ethernet7)
+		.value("OP_Ethernet8", Network::_icsneo_netid_t::OP_Ethernet8)
+		.value("OP_Ethernet9", Network::_icsneo_netid_t::OP_Ethernet9)
+		.value("OP_Ethernet10", Network::_icsneo_netid_t::OP_Ethernet10)
+		.value("OP_Ethernet11", Network::_icsneo_netid_t::OP_Ethernet11)
+		.value("FlexRay1a", Network::_icsneo_netid_t::FlexRay1a)
+		.value("FlexRay1b", Network::_icsneo_netid_t::FlexRay1b)
+		.value("FlexRay2a", Network::_icsneo_netid_t::FlexRay2a)
+		.value("FlexRay2b", Network::_icsneo_netid_t::FlexRay2b)
+		.value("LIN5", Network::_icsneo_netid_t::LIN5)
+		.value("FlexRay", Network::_icsneo_netid_t::FlexRay)
+		.value("FlexRay2", Network::_icsneo_netid_t::FlexRay2)
+		.value("OP_Ethernet12", Network::_icsneo_netid_t::OP_Ethernet12)
+		.value("I2C", Network::_icsneo_netid_t::I2C)
+		.value("MOST25", Network::_icsneo_netid_t::MOST25)
+		.value("MOST50", Network::_icsneo_netid_t::MOST50)
+		.value("MOST150", Network::_icsneo_netid_t::MOST150)
+		.value("Ethernet", Network::_icsneo_netid_t::Ethernet)
+		.value("GMFSA", Network::_icsneo_netid_t::GMFSA)
+		.value("TCP", Network::_icsneo_netid_t::TCP)
+		.value("HSCAN6", Network::_icsneo_netid_t::HSCAN6)
+		.value("HSCAN7", Network::_icsneo_netid_t::HSCAN7)
+		.value("LIN6", Network::_icsneo_netid_t::LIN6)
+		.value("LSFTCAN2", Network::_icsneo_netid_t::LSFTCAN2)
+		.value("LogicalDiskInfo", Network::_icsneo_netid_t::LogicalDiskInfo)
+		.value("WiVICommand", Network::_icsneo_netid_t::WiVICommand)
+		.value("ScriptStatus", Network::_icsneo_netid_t::ScriptStatus)
+		.value("EthPHYControl", Network::_icsneo_netid_t::EthPHYControl)
+		.value("ExtendedCommand", Network::_icsneo_netid_t::ExtendedCommand)
+		.value("ExtendedData", Network::_icsneo_netid_t::ExtendedData)
+		.value("FlexRayControl", Network::_icsneo_netid_t::FlexRayControl)
+		.value("CoreMiniPreLoad", Network::_icsneo_netid_t::CoreMiniPreLoad)
+		.value("HW_COM_Latency_Test", Network::_icsneo_netid_t::HW_COM_Latency_Test)
+		.value("DeviceStatus", Network::_icsneo_netid_t::DeviceStatus)
+		.value("UDP", Network::_icsneo_netid_t::UDP)
+		.value("ForwardedMessage", Network::_icsneo_netid_t::ForwardedMessage)
+		.value("I2C2", Network::_icsneo_netid_t::I2C2)
+		.value("I2C3", Network::_icsneo_netid_t::I2C3)
+		.value("I2C4", Network::_icsneo_netid_t::I2C4)
+		.value("Ethernet2", Network::_icsneo_netid_t::Ethernet2)
+		.value("A2B1", Network::_icsneo_netid_t::A2B1)
+		.value("A2B2", Network::_icsneo_netid_t::A2B2)
+		.value("Ethernet3", Network::_icsneo_netid_t::Ethernet3)
+		.value("WBMS", Network::_icsneo_netid_t::WBMS)
+		.value("DWCAN9", Network::_icsneo_netid_t::DWCAN9)
+		.value("DWCAN10", Network::_icsneo_netid_t::DWCAN10)
+		.value("DWCAN11", Network::_icsneo_netid_t::DWCAN11)
+		.value("DWCAN12", Network::_icsneo_netid_t::DWCAN12)
+		.value("DWCAN13", Network::_icsneo_netid_t::DWCAN13)
+		.value("DWCAN14", Network::_icsneo_netid_t::DWCAN14)
+		.value("DWCAN15", Network::_icsneo_netid_t::DWCAN15)
+		.value("DWCAN16", Network::_icsneo_netid_t::DWCAN16)
+		.value("LIN7", Network::_icsneo_netid_t::LIN7)
+		.value("LIN8", Network::_icsneo_netid_t::LIN8)
+		.value("SPI2", Network::_icsneo_netid_t::SPI2)
+		.value("MDIO1", Network::_icsneo_netid_t::MDIO1)
+		.value("MDIO2", Network::_icsneo_netid_t::MDIO2)
+		.value("MDIO3", Network::_icsneo_netid_t::MDIO3)
+		.value("MDIO4", Network::_icsneo_netid_t::MDIO4)
+		.value("MDIO5", Network::_icsneo_netid_t::MDIO5)
+		.value("MDIO6", Network::_icsneo_netid_t::MDIO6)
+		.value("MDIO7", Network::_icsneo_netid_t::MDIO7)
+		.value("MDIO8", Network::_icsneo_netid_t::MDIO8)
+		.value("OP_Ethernet13", Network::_icsneo_netid_t::OP_Ethernet13)
+		.value("OP_Ethernet14", Network::_icsneo_netid_t::OP_Ethernet14)
+		.value("OP_Ethernet15", Network::_icsneo_netid_t::OP_Ethernet15)
+		.value("OP_Ethernet16", Network::_icsneo_netid_t::OP_Ethernet16)
+		.value("SPI3", Network::_icsneo_netid_t::SPI3)
+		.value("SPI4", Network::_icsneo_netid_t::SPI4)
+		.value("SPI5", Network::_icsneo_netid_t::SPI5)
+		.value("SPI6", Network::_icsneo_netid_t::SPI6)
+		.value("SPI7", Network::_icsneo_netid_t::SPI7)
+		.value("SPI8", Network::_icsneo_netid_t::SPI8)
+		.value("LIN9", Network::_icsneo_netid_t::LIN9)
+		.value("LIN10", Network::_icsneo_netid_t::LIN10)
+		.value("LIN11", Network::_icsneo_netid_t::LIN11)
+		.value("LIN12", Network::_icsneo_netid_t::LIN12)
+		.value("LIN13", Network::_icsneo_netid_t::LIN13)
+		.value("LIN14", Network::_icsneo_netid_t::LIN14)
+		.value("LIN15", Network::_icsneo_netid_t::LIN15)
+		.value("LIN16", Network::_icsneo_netid_t::LIN16)
+		.value("Any", Network::_icsneo_netid_t::Any)
+		.value("Invalid", Network::_icsneo_netid_t::Invalid);
 	
-    network.def(pybind11::init<Network::NetID>());
+    network.def(pybind11::init<Network::_icsneo_netid_t>());
 }
 
 } // namespace icsneo 
diff --git a/communication/communication.cpp b/communication/communication.cpp
index 45c448e..fd7f47e 100644
--- a/communication/communication.cpp
+++ b/communication/communication.cpp
@@ -100,7 +100,7 @@ bool Communication::sendCommand(ExtendedCommand cmd, std::vector<uint8_t> argume
 }
 
 bool Communication::getSettingsSync(std::vector<uint8_t>& data, std::chrono::milliseconds timeout) {
-	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::ReadSettings);
+	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::ReadSettings);
 	std::shared_ptr<Message> msg = waitForMessageSync([this]() {
 		return sendCommand(Command::ReadSettings, { 0, 0, 0, 1 /* Get Global Settings */, 0, 1 /* Subversion 1 */ });
 	}, filter, timeout);
diff --git a/communication/decoder.cpp b/communication/decoder.cpp
index c5d2dbb..17e711c 100644
--- a/communication/decoder.cpp
+++ b/communication/decoder.cpp
@@ -194,7 +194,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 		}
 		case icsneo_msg_bus_type_internal: {
 			switch(packet->network.getNetID()) {
-				case Network::NetID::Reset_Status: {
+				case Network::_icsneo_netid_t::Reset_Status: {
 					// We can deal with not having the last two fields (voltage and temperature)
 					if(packet->data.size() < (sizeof(HardwareResetStatusPacket) - (sizeof(uint16_t) * 2))) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
@@ -225,12 +225,12 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					result = msg;
 					return true;
 				}
-				case Network::NetID::Device: {
+				case Network::_icsneo_netid_t::icsneo_netid_device: {
 					// These are neoVI network messages
 					// They come in as CAN but we will handle them in the device rather than
 					// passing them onto the user.
 					if(packet->data.size() < 24) {
-						auto rawmsg = std::make_shared<InternalMessage>(Network::NetID::Device);
+						auto rawmsg = std::make_shared<InternalMessage>(Network::_icsneo_netid_t::icsneo_netid_device);
 						result = rawmsg;
 						rawmsg->data = packet->data;
 						return true;
@@ -253,12 +253,12 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					raw->network = packet->network;
 					return true;
 				}
-				case Network::NetID::DeviceStatus: {
+				case Network::_icsneo_netid_t::DeviceStatus: {
 					// Just pass along the data, the device needs to handle this itself
 					result = std::make_shared<InternalMessage>(packet->network, packet->data);
 					return true;
 				}
-				case Network::NetID::RED_INT_MEMORYREAD: {
+				case Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread: {
 					if(packet->data.size() != 512 + sizeof(uint16_t)) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
 						return false; // Should get enough data for a start address and sector
@@ -270,7 +270,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					msg->data.insert(msg->data.end(), packet->data.begin() + 2, packet->data.end());
 					return true;
 				}
-				case Network::NetID::NeoMemorySDRead: {
+				case Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread: {
 					if(packet->data.size() != 512 + sizeof(uint32_t)) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
 						return false; // Should get enough data for a start address and sector
@@ -282,7 +282,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					msg->data.insert(msg->data.end(), packet->data.begin() + 4, packet->data.end());
 					return true;
 				}
-				case Network::NetID::ExtendedCommand: {
+				case Network::_icsneo_netid_t::ExtendedCommand: {
 
 					if(packet->data.size() < sizeof(ExtendedResponseMessage::PackedGenericResponse))
 						break; // Handle as a raw message, might not be a generic response
@@ -313,7 +313,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					break;
 				}
-				case Network::NetID::ExtendedData: {
+				case Network::_icsneo_netid_t::ExtendedData: {
 					if(packet->data.size() < sizeof(ExtendedDataMessage::ExtendedDataHeader))
 						break;
 					const auto& header = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(packet->data.data());
@@ -328,7 +328,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 							
 							std::copy(packet->data.begin() + sizeof(header), packet->data.begin() + sizeof(header) + numRead, extDataMsg->data.begin());
 
-							extDataMsg->network = Network(static_cast<uint16_t>(Network::NetID::ExtendedData), false);
+							extDataMsg->network = Network(static_cast<uint16_t>(Network::_icsneo_netid_t::ExtendedData), false);
 							return true;
 						}
 						default:
@@ -336,7 +336,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					break;
 				}
-				case Network::NetID::FlexRayControl: {
+				case Network::_icsneo_netid_t::FlexRayControl: {
 					auto frResult = std::make_shared<FlexRayControlMessage>(*packet);
 					if(!frResult->decoded) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);
@@ -345,7 +345,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					result = frResult;
 					return true;
 				}
-				case Network::NetID::Main51: {
+				case Network::_icsneo_netid_t::icsneo_netid_main51: {
 					switch((Command)packet->data[0]) {
 						case Command::RequestSerialNumber: {
 							auto msg = std::make_shared<SerialNumberMessage>();
@@ -397,7 +397,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 							return true;
 					}
 				}
-				case Network::NetID::RED_OLDFORMAT: {
+				case Network::_icsneo_netid_t::RED_OLDFORMAT: {
 					/* So-called "old format" messages are a "new style, long format" wrapper around the old short messages.
 					 * They consist of a 16-bit LE length first, then the 8-bit length and netid combo byte, then the payload
 					 * with no checksum. The upper-nibble length of the combo byte should be ignored completely, using the
@@ -412,7 +412,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 						packet->data.resize(length);
 					return decode(result, packet);
 				}
-				case Network::NetID::RED_App_Error: {
+				case Network::_icsneo_netid_t::RED_App_Error: {
 					result = AppErrorMessage::DecodeToMessage(packet->data, report);
 					if(!result) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@@ -420,7 +420,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					return true;
 				}
-				case Network::NetID::ReadSettings: {
+				case Network::_icsneo_netid_t::ReadSettings: {
 					auto msg = std::make_shared<ReadSettingsMessage>();
 					msg->response = ReadSettingsMessage::Response(packet->data[0]);
 
@@ -439,7 +439,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					result = msg;
 					return true;
 				}
-				case Network::NetID::LogicalDiskInfo: {
+				case Network::_icsneo_netid_t::LogicalDiskInfo: {
 					result = LogicalDiskInfoPacket::DecodeToMessage(packet->data);
 					if(!result) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@@ -447,7 +447,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					return true;
 				}
-				case Network::NetID::WiVICommand: {
+				case Network::_icsneo_netid_t::WiVICommand: {
 					result = WiVI::CommandPacket::DecodeToMessage(packet->data);
 					if(!result) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@@ -455,7 +455,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					return true;
 				}
-				case Network::NetID::EthPHYControl: {
+				case Network::_icsneo_netid_t::EthPHYControl: {
 					result = HardwareEthernetPhyRegisterPacket::DecodeToMessage(packet->data, report);
 					if(!result) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@@ -463,7 +463,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					return true;
 				}
-				case Network::NetID::ScriptStatus: {
+				case Network::_icsneo_netid_t::ScriptStatus: {
 					result = ScriptStatus::DecodeToMessage(packet->data);
 					if(!result) {
 						report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::EventWarning);
@@ -471,7 +471,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					}
 					return true;
 				}
-				case Network::NetID::DiskData: {
+				case Network::_icsneo_netid_t::icsneo_netid_disk_data: {
 					result = std::make_shared<DiskDataMessage>(std::move(packet->data));
 					return true;
 				}
diff --git a/communication/encoder.cpp b/communication/encoder.cpp
index c453fee..d55005a 100644
--- a/communication/encoder.cpp
+++ b/communication/encoder.cpp
@@ -138,10 +138,10 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 			netid = uint16_t(raw->network.getNetID());
 
 			switch(raw->network.getNetID()) {
-				case Network::NetID::Device:
+				case Network::_icsneo_netid_t::icsneo_netid_device:
 					shortFormat = true;
 					break;
-				case Network::NetID::RED_OLDFORMAT: {
+				case Network::_icsneo_netid_t::RED_OLDFORMAT: {
 					// See the decoder for an explanation
 					// We expect the network byte to be populated already in data, but not the length
 					uint16_t length = uint16_t(raw->data.size()) - 1;
@@ -162,7 +162,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 			}
 
 			buffer = &m51msg->data;
-			netid = uint16_t(Network::NetID::Main51);
+			netid = uint16_t(Network::_icsneo_netid_t::icsneo_netid_main51);
 
 			if(!m51msg->forceShortFormat) {
 				// Main51 can be sent as a long message without setting the NetID to RED first
@@ -172,7 +172,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 				size += 1; // Even though we are not including the NetID bytes, the device expects them to be counted in the length
 				size += 1; // Main51 Command
 				m51msg->data.insert(m51msg->data.begin(), {
-					(uint8_t)Network::NetID::Main51, // 0x0B for long message
+					(uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51, // 0x0B for long message
 					(uint8_t)size, // Size, little endian 16-bit
 					(uint8_t)(size >> 8),
 					(uint8_t)m51msg->command
@@ -223,7 +223,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 		uint16_t size = static_cast<uint16_t>(buffer->size()) + 1 + 1 + 2 + 2 + 1;
 
 		buffer->insert(buffer->begin(), {
-			(uint8_t)Network::NetID::RED, // 0x0C for long message
+			(uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
 			(uint8_t)size, // Size, little endian 16-bit
 			(uint8_t)(size >> 8),
 			(uint8_t)netid, // NetID, little endian 16-bit
@@ -238,12 +238,12 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result, Command cmd, std::vector<uint8_t> arguments) {
 	std::shared_ptr<Message> msg;
 	if(cmd == Command::UpdateLEDState) {
-		/* NetID::Device is a super old command type.
+		/* _icsneo_netid_t::Device is a super old command type.
 		 * It has a leading 0x00 byte, a byte for command, and a byte for an argument.
 		 * In this case, command 0x06 is SetLEDState.
 		 * This old command type is not really used anywhere else.
 		 */
-		auto canmsg = std::make_shared<InternalMessage>(Network::NetID::Device);
+		auto canmsg = std::make_shared<InternalMessage>(Network::_icsneo_netid_t::icsneo_netid_device);
 		msg = canmsg;
 		if(arguments.empty()) {
 			report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error);
diff --git a/communication/message/apperrormessage.cpp b/communication/message/apperrormessage.cpp
index 038a389..aca1948 100644
--- a/communication/message/apperrormessage.cpp
+++ b/communication/message/apperrormessage.cpp
@@ -21,10 +21,10 @@ std::shared_ptr<Message> AppErrorMessage::DecodeToMessage(const std::vector<uint
 	}
 	auto appErr = std::make_shared<AppErrorMessage>();
 	appErr->errorType = data->error_type;
-	appErr->errorNetID = static_cast<Network::NetID>(data->network_id);
+	appErr->errorNetID = static_cast<Network::_icsneo_netid_t>(data->network_id);
 	appErr->timestamp10us = data->uiTimeStamp10uS;
 	appErr->timestamp10usMSB = data->uiTimeStamp10uSMSB;
-	appErr->network = Network::NetID::RED_App_Error;
+	appErr->network = Network::_icsneo_netid_t::RED_App_Error;
 	return appErr;
 }
 
diff --git a/communication/message/neomessage.cpp b/communication/message/neomessage.cpp
index 2463732..73dc0a0 100644
--- a/communication/message/neomessage.cpp
+++ b/communication/message/neomessage.cpp
@@ -19,7 +19,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
 		auto framemsg = std::static_pointer_cast<BusMessage>(message);
 		const auto netType = framemsg->network.getType();
 
-		frame.netid = (neonetid_t)framemsg->network.getNetID();
+		frame.netid = (icsneo_netid_t)framemsg->network.getNetID();
 		frame.type = (icsneo_msg_bus_type_t)netType;
 		frame.description = framemsg->description;
 		frame.length = framemsg->data.size();
@@ -108,7 +108,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
 		canerror.transmitErrorCount = canerrormsg->transmitErrorCount;
 		canerror.receiveErrorCount = canerrormsg->receiveErrorCount;
 		canerror.status.canBusOff = canerrormsg->busOff;
-		canerror.netid = (neonetid_t)canerrormsg->network.getNetID();
+		canerror.netid = (icsneo_netid_t)canerrormsg->network.getNetID();
 		canerror.type = (icsneo_msg_bus_type_t)canerrormsg->network.getType();
 		break;
 	}
diff --git a/communication/packet/iso9141packet.cpp b/communication/packet/iso9141packet.cpp
index 7a6506d..b4ed5bb 100644
--- a/communication/packet/iso9141packet.cpp
+++ b/communication/packet/iso9141packet.cpp
@@ -30,10 +30,10 @@ bool HardwareISO9141Packet::EncodeFromMessage(const ISO9141Message& message, std
 			currentSize = (uint8_t)(bytesToSend - currentStart);
 
 		packet.insert(packet.begin(), {
-			(uint8_t)Network::NetID::RED, // 0x0C for long message
+			(uint8_t)Network::_icsneo_netid_t::icsneo_netid_red, // 0x0C for long message
 			(uint8_t)0, // Size, little endian 16-bit, filled later
 			(uint8_t)0,
-			(uint8_t)message.network.getNetID(), // NetID, little endian 16-bit
+			(uint8_t)message.network.getNetID(), // _icsneo_netid_t, little endian 16-bit
 			(uint8_t)(uint16_t(message.network.getNetID()) >> 8)
 		});
 		packet.push_back(uint8_t(message.network.getNetID()) + uint8_t((currentSize + (firstPacket ? 6 : 3)) << 4));
diff --git a/communication/packet/livedatapacket.cpp b/communication/packet/livedatapacket.cpp
index eb796f1..ded1238 100644
--- a/communication/packet/livedatapacket.cpp
+++ b/communication/packet/livedatapacket.cpp
@@ -113,7 +113,7 @@ bool HardwareLiveDataPacket::EncodeFromMessage(LiveDataMessage& message, std::ve
 		return false;
 	}
 
-	header->netid = static_cast<uint8_t>(Network::NetID::Main51);
+	header->netid = static_cast<uint8_t>(Network::_icsneo_netid_t::icsneo_netid_main51);
 	header->fullLength = fullSize;
 	header->command = static_cast<uint8_t>(Command::Extended);
 	header->extendedCommand = static_cast<uint16_t>(ExtendedCommand::LiveData);
diff --git a/communication/packetizer.cpp b/communication/packetizer.cpp
index 3e43fef..0040187 100644
--- a/communication/packetizer.cpp
+++ b/communication/packetizer.cpp
@@ -54,7 +54,7 @@ bool Packetizer::input(RingBuffer& bytes) {
 				if(packetLength == 0) {
 					state = ReadState::ParseLongStylePacketHeader;
 					break;
-				} else if(packetLength == 0xA && packet.network == Network::NetID::DiskData) {
+				} else if(packetLength == 0xA && packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data) {
 					state = ReadState::ParseDiskDataHeader;
 					break;
 				}
@@ -159,7 +159,7 @@ bool Packetizer::input(RingBuffer& bytes) {
 					processedPackets.push_back(std::make_shared<Packet>(packet));
 					bytes.pop(packetLength);
 
-					if(packet.network == Network::NetID::DiskData && (packetLength - headerSize) % 2 == 0) {
+					if(packet.network == Network::_icsneo_netid_t::icsneo_netid_disk_data && (packetLength - headerSize) % 2 == 0) {
 						bytes.pop_front();
 					}
 				} else {
diff --git a/device/device.cpp b/device/device.cpp
index b68f565..4c08b5a 100644
--- a/device/device.cpp
+++ b/device/device.cpp
@@ -389,7 +389,7 @@ bool Device::goOnline() {
 
 	updateLEDState();
 
-	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::Reset_Status);
+	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::Reset_Status);
 	filter->includeInternalInAny = true;
 
 	// Wait until communication is enabled or 5 seconds, whichever comes first
@@ -432,7 +432,7 @@ bool Device::goOffline() {
 
 	updateLEDState();
 
-	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::Reset_Status);
+	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::Reset_Status);
 	filter->includeInternalInAny = true;
 
 	// Wait until communication is disabled or 5 seconds, whichever comes first
@@ -457,7 +457,7 @@ int8_t Device::prepareScriptLoad() {
 		return false;
 	}
 
-	static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::CoreMiniPreLoad);
+	static std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::CoreMiniPreLoad);
 
 	if(!com->sendCommand(Command::CoreMiniPreload))
 		return false;
@@ -488,7 +488,7 @@ bool Device::startScript(Disk::MemoryType memType)
 
 	uint8_t location = static_cast<uint8_t>(memType);
 
-	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::Device);
+	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_device);
 	filter->includeInternalInAny = true;
 
 	const auto response = com->waitForMessageSync([&]() {
@@ -510,7 +510,7 @@ bool Device::stopScript()
 		return false;
 	}
 
-	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::Device);
+	std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_device);
 	filter->includeInternalInAny = true;
 
 	const auto response = com->waitForMessageSync([&]() {
@@ -597,7 +597,7 @@ bool Device::uploadCoremini(std::istream& stream, Disk::MemoryType memType) {
 }
 
 bool Device::eraseScriptMemory(Disk::MemoryType memType, uint64_t amount) {
-	static std::shared_ptr<MessageFilter> NeoEraseDone = std::make_shared<MessageFilter>(Network::NetID::NeoMemoryWriteDone);
+	static std::shared_ptr<MessageFilter> NeoEraseDone = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
 
 	if(!supportsEraseMemory()) {
 		return true;
@@ -798,7 +798,7 @@ Network Device::getNetworkByNumber(icsneo_msg_bus_type_t type, size_t index) con
 				return net;
 		}
 	}
-	return Network::NetID::Invalid;
+	return Network::_icsneo_netid_t::Invalid;
 }
 
 std::shared_ptr<HardwareInfo> Device::getHardwareInfo(std::chrono::milliseconds timeout) {
@@ -1721,7 +1721,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
 		case Message::Type::InternalMessage: {
 			auto rawMessage = std::static_pointer_cast<InternalMessage>(message);
 			switch(rawMessage->network.getNetID()) {
-				case Network::NetID::Device: {
+				case Network::_icsneo_netid_t::icsneo_netid_device: {
 					// Device is not guaranteed to be a CANMessage, it might be a InternalMessage
 					// if it couldn't be decoded to a CANMessage. We only care about the
 					// CANMessage decoding right now.
@@ -1730,7 +1730,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
 						handleNeoVIMessage(std::move(canmsg));
 					break;
 				}
-				case Network::NetID::DeviceStatus:
+				case Network::_icsneo_netid_t::DeviceStatus:
 					// Device Status format is unique per device, so the devices need to decode it themselves
 					handleDeviceStatus(rawMessage);
 					break;
@@ -1817,7 +1817,7 @@ std::optional<EthPhyMessage> Device::sendEthPhyMsg(const EthPhyMessage& message,
 	HardwareEthernetPhyRegisterPacket::EncodeFromMessage(message, bytes, report);
 	std::shared_ptr<Message> response = com->waitForMessageSync(
 		[this, bytes](){ return com->sendCommand(Command::PHYControlRegisters, bytes); },
-		std::make_shared<MessageFilter>(Network::NetID::EthPHYControl), timeout);
+		std::make_shared<MessageFilter>(Network::_icsneo_netid_t::EthPHYControl), timeout);
 
 	if(!response) {
 		report(APIEvent::Type::NoDeviceResponse, APIEvent::Severity::Error);
@@ -1888,7 +1888,7 @@ std::optional<bool> Device::SetRootDirectoryEntryFlags(uint8_t mask, uint8_t val
 
 std::optional<std::chrono::time_point<std::chrono::system_clock>> Device::getRTC()
 {
-	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::NetID::RED_GET_RTC);
+	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::RED_GET_RTC);
 	std::shared_ptr<Message> generic = com->waitForMessageSync([this]() {
 		return com->sendCommand(Command::GetRTC);
 	}, filter, std::chrono::milliseconds(3000));
@@ -2023,7 +2023,7 @@ bool Device::readBinaryFile(std::ostream& stream, uint16_t binaryIndex) {
 	std::vector<uint8_t> arguments(sizeof(ExtendedDataMessage::ExtendedDataHeader));
 	ExtendedDataMessage::ExtendedDataHeader& parameters = *reinterpret_cast<ExtendedDataMessage::ExtendedDataHeader*>(arguments.data());	
 
-	auto filter = std::make_shared<MessageFilter>(Network::NetID::ExtendedData);
+	auto filter = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::ExtendedData);
 	
 	for(size_t offset = 0; offset < *size; offset+=ExtendedDataMessage::MaxExtendedDataBufferSize) {
 		parameters.subCommand = ExtendedDataSubCommand::GenericBinaryRead;
@@ -3260,13 +3260,13 @@ std::optional<uint64_t> Device::getVSADiskSize() {
 	return diskSize;
 }
 
-bool Device::requestTC10Wake(Network::NetID network) {
+bool Device::requestTC10Wake(Network::_icsneo_netid_t network) {
 	if(!supportsTC10()) {
 		report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
 		return false;
 	}
 	std::vector<uint8_t> args(sizeof(network));
-	*(Network::NetID*)args.data() = network;
+	*(Network::_icsneo_netid_t*)args.data() = network;
 	auto msg = com->waitForMessageSync([&] {
 		return com->sendCommand(ExtendedCommand::RequestTC10Wake, args);
 	}, std::make_shared<MessageFilter>(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000));
@@ -3285,13 +3285,13 @@ bool Device::requestTC10Wake(Network::NetID network) {
 	return resp->response == ExtendedResponse::OK;
 }
 
-bool Device::requestTC10Sleep(Network::NetID network) {
+bool Device::requestTC10Sleep(Network::_icsneo_netid_t network) {
 	if(!supportsTC10()) {
 		report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
 		return false;
 	}
 	std::vector<uint8_t> args(sizeof(network));
-	*(Network::NetID*)args.data() = network;
+	*(Network::_icsneo_netid_t*)args.data() = network;
 	auto msg = com->waitForMessageSync([&] {
 		return com->sendCommand(ExtendedCommand::RequestTC10Sleep, args);
 	}, std::make_shared<MessageFilter>(Message::Type::ExtendedResponse), std::chrono::milliseconds(1000));
@@ -3310,13 +3310,13 @@ bool Device::requestTC10Sleep(Network::NetID network) {
 	return typed->response == ExtendedResponse::OK;
 }
 
-std::optional<TC10StatusMessage> Device::getTC10Status(Network::NetID network) {
+std::optional<TC10StatusMessage> Device::getTC10Status(Network::_icsneo_netid_t network) {
 	if(!supportsTC10()) {
 		report(APIEvent::Type::NotSupported, APIEvent::Severity::Error);
 		return std::nullopt;
 	}
 	std::vector<uint8_t> args(sizeof(network));
-	*(Network::NetID*)args.data() = network;
+	*(Network::_icsneo_netid_t*)args.data() = network;
 	auto msg = com->waitForMessageSync([&] {
 		return com->sendCommand(ExtendedCommand::GetTC10Status, args);
 	}, std::make_shared<MessageFilter>(Message::Type::TC10Status), std::chrono::milliseconds(1000));
diff --git a/device/extensions/flexray/controller.cpp b/device/extensions/flexray/controller.cpp
index da13f37..e3d63fd 100644
--- a/device/extensions/flexray/controller.cpp
+++ b/device/extensions/flexray/controller.cpp
@@ -610,7 +610,7 @@ uint16_t FlexRay::Controller::CalculateCycleFilter(uint8_t baseCycle, uint8_t cy
 }
 
 std::pair<bool, uint32_t> FlexRay::Controller::readRegister(ERAYRegister reg, std::chrono::milliseconds timeout) const {
-	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::NetID::FlexRayControl);
+	static const std::shared_ptr<MessageFilter> filter = std::make_shared<MessageFilter>(icsneo::Network::_icsneo_netid_t::FlexRayControl);
 	if(timeout.count() <= 20)
 		return {false, 0}; // Out of time!
 
diff --git a/disk/extextractordiskreaddriver.cpp b/disk/extextractordiskreaddriver.cpp
index 8e6baa3..3617c68 100644
--- a/disk/extextractordiskreaddriver.cpp
+++ b/disk/extextractordiskreaddriver.cpp
@@ -34,7 +34,7 @@ std::optional<uint64_t> ExtExtractorDiskReadDriver::readLogicalDiskAligned(Commu
 
 std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t report,
 	uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
-	static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead);
+	static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
 
 	uint64_t sector = pos / SectorSize;
 
@@ -67,7 +67,7 @@ std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligne
 				cv.notify_all();
 			}
 		}
-	}, std::make_shared<MessageFilter>(Network::NetID::DiskData)));
+	}, std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_disk_data)));
 
 	if(!com.sendCommand(ExtendedCommand::Extract, {
 		uint8_t(sector & 0xff),
diff --git a/disk/neomemorydiskdriver.cpp b/disk/neomemorydiskdriver.cpp
index fa75819..8b926f9 100644
--- a/disk/neomemorydiskdriver.cpp
+++ b/disk/neomemorydiskdriver.cpp
@@ -9,7 +9,7 @@ using namespace icsneo::Disk;
 
 std::optional<uint64_t> NeoMemoryDiskDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report,
 	uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) {
-	const auto filter = std::make_shared<MessageFilter>((memType == MemoryType::SD ? Network::NetID::NeoMemorySDRead : Network::NetID::RED_INT_MEMORYREAD));
+	const auto filter = std::make_shared<MessageFilter>((memType == MemoryType::SD ? Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread : Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread));
 	filter->includeInternalInAny = true;
 
 	if(pos % SectorSize != 0)
@@ -61,7 +61,7 @@ std::optional<uint64_t> NeoMemoryDiskDriver::readLogicalDiskAligned(Communicatio
 std::optional<uint64_t> NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t report,
 	uint64_t pos, const uint8_t* from, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) {
 
-	static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::NetID::NeoMemoryWriteDone);
+	static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_write_done);
 
 	if(pos % SectorSize != 0)
 		return std::nullopt;
diff --git a/disk/plasiondiskreaddriver.cpp b/disk/plasiondiskreaddriver.cpp
index 466c7dd..6fd3133 100644
--- a/disk/plasiondiskreaddriver.cpp
+++ b/disk/plasiondiskreaddriver.cpp
@@ -8,7 +8,7 @@ using namespace icsneo::Disk;
 
 std::optional<uint64_t> PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report,
 	uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
-	static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead);
+	static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread);
 
 	if(amount > getBlockSizeBounds().second)
 		return std::nullopt;
diff --git a/disk/vsa/vsa.cpp b/disk/vsa/vsa.cpp
index 761b220..6022519 100644
--- a/disk/vsa/vsa.cpp
+++ b/disk/vsa/vsa.cpp
@@ -22,7 +22,7 @@ void VSAExtendedMessage::appendPacket(std::shared_ptr<Packet> packet) const
 {
 	packet->data.insert(packet->data.end(), payload.begin(), payload.end());
 	// Set the network if not already set (Happens in AA0F records)
-	if(packet->network.getNetID() == Network::NetID::Invalid) {
+	if(packet->network.getNetID() == Network::_icsneo_netid_t::Invalid) {
 		packet->network = network;
 	}
 }
diff --git a/examples/cpp/a2b/src/a2b.cpp b/examples/cpp/a2b/src/a2b.cpp
index 51211f1..59b38cf 100644
--- a/examples/cpp/a2b/src/a2b.cpp
+++ b/examples/cpp/a2b/src/a2b.cpp
@@ -79,7 +79,7 @@ void example0(const std::shared_ptr<icsneo::Device>& rada2b) {
 				true /* true if we want 16 bit channels in the message, false for 32 bit. This should match the RAD-A2B device setting */
 			);
 			msg->txmsg = true;
-			msg->network = icsneo::Network(icsneo::Network::NetID::A2B2);
+			msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::A2B2);
 
 			// Load the WAV audio data into the desired channel, break if we fail to load
 			if(!msg->loadAudioBuffer(wavStream, channelMap)) {
@@ -192,7 +192,7 @@ void example3(const std::shared_ptr<icsneo::Device>& rada2b) {
 		std::shared_ptr<icsneo::A2BMessage> a2bmsgPtr = std::make_shared<icsneo::A2BMessage>(numFrames, icsneo::A2BMessage::TDMMode::TDM4, true);
 
 		icsneo::A2BMessage& a2bmsg = *a2bmsgPtr.get();
-		a2bmsg.network = icsneo::Network(icsneo::Network::NetID::A2B2);
+		a2bmsg.network = icsneo::Network(icsneo::Network::_icsneo_netid_t::A2B2);
 		a2bmsg.txmsg = true;
 
 		for(size_t frame = 0; frame < a2bmsg.getNumFrames(); frame++) {
@@ -245,9 +245,9 @@ void example3(const std::shared_ptr<icsneo::Device>& rada2b) {
 */
 void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
 	std::shared_ptr<icsneo::I2CMessage> msg = std::make_shared<icsneo::I2CMessage>();
-	std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::NetID::I2C2);
+	std::shared_ptr<icsneo::MessageFilter> msgFilter = std::make_shared<icsneo::MessageFilter>(icsneo::Network::_icsneo_netid_t::I2C2);
 
-	msg->network = icsneo::Network(icsneo::Network::NetID::I2C2);
+	msg->network = icsneo::Network(icsneo::Network::_icsneo_netid_t::I2C2);
 	msg->controlBytes.resize(1);
 	msg->controlBytes[0] = static_cast<uint8_t>(0x17u); // Register address for A2B INTTYPE
 	msg->dataBytes.resize(1, 0);
@@ -261,7 +261,7 @@ void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
 
 			if(newMsg->type == icsneo::Message::Type::BusMessage) {
 				const auto& frame = std::dynamic_pointer_cast<icsneo::BusMessage>(newMsg);
-				if(frame && frame->network.getNetID() == icsneo::Network::NetID::I2C2) {
+				if(frame && frame->network.getNetID() == icsneo::Network::_icsneo_netid_t::I2C2) {
 					const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame);
 
 					if(!i2cMessage) {
diff --git a/examples/cpp/apperror/src/AppErrorExample.cpp b/examples/cpp/apperror/src/AppErrorExample.cpp
index 2854a87..157bbef 100644
--- a/examples/cpp/apperror/src/AppErrorExample.cpp
+++ b/examples/cpp/apperror/src/AppErrorExample.cpp
@@ -40,7 +40,7 @@ int main() {
 		// Add your error handling here
 		auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>(filter, [](std::shared_ptr<icsneo::Message> message) {
 			auto msg = std::static_pointer_cast<icsneo::AppErrorMessage>(message);
-			if(icsneo::Network::NetID::RED_App_Error == msg->network.getNetID()) {
+			if(icsneo::Network::_icsneo_netid_t::RED_App_Error == msg->network.getNetID()) {
 				std::cout << std::endl << "App error reported:" << std::endl;
 				std::cout << msg->getAppErrorString() << std::endl << std::endl;
 			}
@@ -58,7 +58,7 @@ int main() {
 		// Prepare a CAN message
 		std::cout << std::endl << "Transmitting a CAN frame... ";
 		auto txMessage = std::make_shared<icsneo::CANMessage>();
-		txMessage->network = icsneo::Network::NetID::HSCAN;
+		txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
 		txMessage->arbid = 0x22;
 		txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc});
 		// The DLC will come from the length of the data vector
diff --git a/examples/cpp/interactive/src/InteractiveExample.cpp b/examples/cpp/interactive/src/InteractiveExample.cpp
index ebbf9c7..970ceb3 100644
--- a/examples/cpp/interactive/src/InteractiveExample.cpp
+++ b/examples/cpp/interactive/src/InteractiveExample.cpp
@@ -508,7 +508,7 @@ int main() {
 
 			std::cout << "Transmitting a normal CAN frame..." << std::endl;
 			auto msg = std::make_shared<icsneo::CANMessage>();
-			msg->network = icsneo::Network::NetID::HSCAN;
+			msg->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
 			msg->arbid = 0x120;
 			msg->data.insert(msg->data.end(), {0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff});
 			msg->isExtended = false;
@@ -565,7 +565,7 @@ int main() {
 			selectedDevice = selectDevice(devices);
 
 			// Attempt to set baudrate and apply settings
-			if(selectedDevice->settings->setBaudrateFor(icsneo::Network::NetID::HSCAN, 250000) && selectedDevice->settings->apply()) {
+			if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 250000) && selectedDevice->settings->apply()) {
 				std::cout << "Successfully set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl;
 			} else {
 				std::cout << "Failed to set HS CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl;
@@ -586,7 +586,7 @@ int main() {
 			selectedDevice = selectDevice(devices);
 
 			// Attempt to set baudrate and apply settings
-			if(selectedDevice->settings->setBaudrateFor(icsneo::Network::NetID::LSFTCAN, 250000) && selectedDevice->settings->apply()) {
+			if(selectedDevice->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lsftcan, 250000) && selectedDevice->settings->apply()) {
 				std::cout << "Successfully set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl;
 			} else {
 				std::cout << "Failed to set LSFT CAN baudrate for " << selectedDevice->describe() << " to 250k!" << std::endl << std::endl;
@@ -790,7 +790,7 @@ int main() {
 			selectedDevice = selectDevice(devices);
 
 			std::cout << "Termination is ";
-			const auto val = selectedDevice->settings->isTerminationEnabledFor(icsneo::Network::NetID::HSCAN);
+			const auto val = selectedDevice->settings->isTerminationEnabledFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 			if(!val.has_value()) {
 				std::cout << "not available at this time: " << icsneo::GetLastError() << std::endl << std::endl;
 				break;
@@ -807,7 +807,7 @@ int main() {
 			}
 
 			// Attempt to set termination and apply settings
-			if(selectedDevice->settings->setTerminationFor(icsneo::Network::NetID::HSCAN, selection2 == '1') && selectedDevice->settings->apply()) {
+			if(selectedDevice->settings->setTerminationFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, selection2 == '1') && selectedDevice->settings->apply()) {
 				std::cout << "Successfully set HS CAN termination for " << selectedDevice->describe() << std::endl;
 			} else {
 				std::cout << "Failed to set HS CAN termination for " << selectedDevice->describe() << std::endl;
diff --git a/examples/cpp/lin/src/LINExample.cpp b/examples/cpp/lin/src/LINExample.cpp
index aa64e30..64ae601 100644
--- a/examples/cpp/lin/src/LINExample.cpp
+++ b/examples/cpp/lin/src/LINExample.cpp
@@ -33,27 +33,27 @@ int main() {
 		int64_t baud = 19200;
 
 		std::cout << "Enable LIN commander resistor... ";
-		ret = device->settings->setCommanderResistorFor(icsneo::Network::NetID::LIN, true);
+		ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, true);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Disable LIN2 commander resistor... ";
-		ret = device->settings->setCommanderResistorFor(icsneo::Network::NetID::LIN2, false);
+		ret = device->settings->setCommanderResistorFor(icsneo::Network::_icsneo_netid_t::LIN2, false);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Setting LIN to operate at " << baud << "bit/s... ";
-		ret = device->settings->setBaudrateFor(icsneo::Network::NetID::LIN, baud);
+		ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, baud);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Setting LIN2 to operate at " << baud << "bit/s... ";
-		ret = device->settings->setBaudrateFor(icsneo::Network::NetID::LIN2, baud);
+		ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::LIN2, baud);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Setting LIN mode to NORMAL... ";
-		ret = device->settings->setLINModeFor(icsneo::Network::NetID::LIN, NORMAL_MODE);
+		ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin, NORMAL_MODE);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Setting LIN2 mode to NORMAL... ";
-		ret = device->settings->setLINModeFor(icsneo::Network::NetID::LIN2, NORMAL_MODE);
+		ret = device->settings->setLINModeFor(icsneo::Network::_icsneo_netid_t::LIN2, NORMAL_MODE);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Applying settings... ";
@@ -61,14 +61,14 @@ int main() {
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "Getting LIN Baudrate... ";
-		int64_t readBaud = device->settings->getBaudrateFor(icsneo::Network::NetID::LIN);
+		int64_t readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_lin);
 		if(readBaud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
 			std::cout << "OK, " << (readBaud) << "bit/s" << std::endl;
 
 		std::cout << "Getting LIN2 Baudrate... ";
-		readBaud = device->settings->getBaudrateFor(icsneo::Network::NetID::LIN2);
+		readBaud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::LIN2);
 		if(readBaud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
@@ -115,7 +115,7 @@ int main() {
 		// We can transmit messages
 		std::cout << "Transmitting a LIN responder data frame... ";
 		auto lin_r = std::make_shared<icsneo::LINMessage>();
-		lin_r->network = icsneo::Network::NetID::LIN2;
+		lin_r->network = icsneo::Network::_icsneo_netid_t::LIN2;
 		lin_r->ID = 0x11;
 		lin_r->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER;
 		lin_r->data = {0xaa, 0xbb, 0xcc, 0xdd, 0x11, 0x22, 0x33, 0x44};
@@ -124,7 +124,7 @@ int main() {
 
 		std::cout << "Transmitting a LIN commander header... ";
 		auto lin_c = std::make_shared<icsneo::LINMessage>();
-		lin_c->network = icsneo::Network::NetID::LIN;
+		lin_c->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin;
 		lin_c->ID = 0x11;
 		lin_c->linMsgType = icsneo::LINMessage::Type::LIN_HEADER_ONLY;
 		ret = device->transmit(lin_c);
@@ -134,7 +134,7 @@ int main() {
 
 		std::cout << "Transmitting a LIN commander frame with responder data... ";
 		auto lin_d = std::make_shared<icsneo::LINMessage>();
-		lin_d->network = icsneo::Network::NetID::LIN;
+		lin_d->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_lin;
 		lin_d->ID = 0x22;
 		lin_d->isEnhancedChecksum = true;
 		lin_d->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG;
diff --git a/examples/cpp/mdio/src/MDIOExample.cpp b/examples/cpp/mdio/src/MDIOExample.cpp
index 7ff5937..074fa3f 100644
--- a/examples/cpp/mdio/src/MDIOExample.cpp
+++ b/examples/cpp/mdio/src/MDIOExample.cpp
@@ -117,7 +117,7 @@ int main()
 		// We can transmit messages to read the PHY ID of BCM89810 PHY
 		std::cout << "\tTransmitting a MDIO request to read ID on BCM89810...\n";
 		auto mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x00u;
 		mdio_r->regAddress = 0x02u;
 		mdio_r->direction = icsneo::MDIOMessage::Direction::Read;
@@ -128,7 +128,7 @@ int main()
 		// We can transmit messages to write to arbitrary register
 		std::cout << "\tTransmitting a MDIO request to write register on BCM89810...\n";
 		mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x00u;
 		mdio_r->regAddress = 0x1Bu;
 		mdio_r->data = {0xAA, 0xAF};
@@ -140,7 +140,7 @@ int main()
 		// We can transmit messages to read back to arbitrary register
 		std::cout << "\tTransmitting a MDIO request to read register on BCM89810...\n";
 		mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x00u;
 		mdio_r->regAddress = 0x1Bu;
 		mdio_r->direction = icsneo::MDIOMessage::Direction::Read;
@@ -154,7 +154,7 @@ int main()
 		// We can transmit messages to read the PHY ID of BCM89810 PHY
 		std::cout << "\tTransmitting a MDIO request to read ID on 88Q2112...\n";
 		mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x06u;
 		mdio_r->devAddress = 0x01u;
 		mdio_r->regAddress = 0x0002u;
@@ -166,7 +166,7 @@ int main()
 		// We can transmit messages to write to arbitrary register
 		std::cout << "\tTransmitting a MDIO request to write register on 88Q2112...\n";
 		mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x06u;
 		mdio_r->devAddress = 0x01u;
 		mdio_r->regAddress = 0x0902u;
@@ -179,7 +179,7 @@ int main()
 		// We can transmit messages to read back to arbitrary register
 		std::cout << "\tTransmitting a MDIO request to read register on 88Q2112...\n";
 		mdio_r = std::make_shared<icsneo::MDIOMessage>();
-		mdio_r->network = icsneo::Network::NetID::MDIO1;
+		mdio_r->network = icsneo::Network::_icsneo_netid_t::MDIO1;
 		mdio_r->phyAddress = 0x06u;
 		mdio_r->devAddress = 0x01u;
 		mdio_r->regAddress = 0x0902u;
diff --git a/examples/cpp/simple/src/SimpleExample.cpp b/examples/cpp/simple/src/SimpleExample.cpp
index 132330a..6b2f8cc 100644
--- a/examples/cpp/simple/src/SimpleExample.cpp
+++ b/examples/cpp/simple/src/SimpleExample.cpp
@@ -38,38 +38,38 @@ int main() {
 		std::cout << "OK" << std::endl;
 
 		std::cout << "\tGetting HSCAN Baudrate... ";
-		int64_t baud = device->settings->getBaudrateFor(icsneo::Network::NetID::HSCAN);
+		int64_t baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
 			std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
 
 		std::cout << "\tSetting HSCAN to operate at 125kbit/s... ";
-		ret = device->settings->setBaudrateFor(icsneo::Network::NetID::HSCAN, 125000);
+		ret = device->settings->setBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 125000);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		// Changes to the settings do not take affect until you call settings->apply()!
 		// When you get the baudrate here, you're reading what the device is currently operating on
 		std::cout << "\tGetting HSCAN Baudrate... (expected to be unchanged) ";
-		baud = device->settings->getBaudrateFor(icsneo::Network::NetID::HSCAN);
+		baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
 			std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
 
 		std::cout << "\tGetting HSCANFD Baudrate... ";
-		baud = device->settings->getFDBaudrateFor(icsneo::Network::NetID::HSCAN);
+		baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
 			std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
 
 		std::cout << "\tSetting HSCANFD to operate at 8Mbit/s... ";
-		ret = device->settings->setFDBaudrateFor(icsneo::Network::NetID::HSCAN, 8000000);
+		ret = device->settings->setFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan, 8000000);
 		std::cout << (ret ? "OK" : "FAIL") << std::endl;
 
 		std::cout << "\tGetting HSCANFD Baudrate... (expected to be unchanged) ";
-		baud = device->settings->getFDBaudrateFor(icsneo::Network::NetID::HSCAN);
+		baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
@@ -84,14 +84,14 @@ int main() {
 
 		// Now that we have applied, we expect that our operating baudrates have changed
 		std::cout << "\tGetting HSCAN Baudrate... ";
-		baud = device->settings->getBaudrateFor(icsneo::Network::NetID::HSCAN);
+		baud = device->settings->getBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
 			std::cout << "OK, " << (baud/1000) << "kbit/s" << std::endl;
 
 		std::cout << "\tGetting HSCANFD Baudrate... ";
-		baud = device->settings->getFDBaudrateFor(icsneo::Network::NetID::HSCAN);
+		baud = device->settings->getFDBaudrateFor(icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan);
 		if(baud < 0)
 			std::cout << "FAIL" << std::endl;
 		else
@@ -155,7 +155,7 @@ int main() {
 		// We can transmit messages
 		std::cout << "\n\tTransmitting an extended CAN FD frame... ";
 		auto txMessage5 = std::make_shared<icsneo::CANMessage>();
-		txMessage5->network = icsneo::Network::NetID::HSCAN;
+		txMessage5->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
 		txMessage5->arbid = 0x1C5001C5;
 		txMessage5->data.insert(txMessage5->data.end(), {0xaa, 0xbb, 0xcc});
 		// The DLC will come from the length of the data vector
@@ -290,7 +290,7 @@ int main() {
 		// We can transmit messages
 		std::cout << "\tTransmitting an extended CAN FD frame... ";
 		auto txMessage = std::make_shared<icsneo::CANMessage>();
-		txMessage->network = icsneo::Network::NetID::HSCAN;
+		txMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_hscan;
 		txMessage->arbid = 0x1C5001C5;
 		txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc});
 		// The DLC will come from the length of the data vector
@@ -301,7 +301,7 @@ int main() {
 
 		std::cout << "\tTransmitting an ethernet frame on OP (BR) Ethernet 2... ";
 		auto ethTxMessage = std::make_shared<icsneo::EthernetMessage>();
-		ethTxMessage->network = icsneo::Network::NetID::OP_Ethernet2;
+		ethTxMessage->network = icsneo::Network::_icsneo_netid_t::icsneo_netid_op_ethernet2;
 		ethTxMessage->data.insert(ethTxMessage->data.end(), {
 			0x00, 0xFC, 0x70, 0x00, 0x01, 0x02, /* Destination MAC */
 			0x00, 0xFC, 0x70, 0x00, 0x01, 0x01, /* Source MAC */
diff --git a/examples/cpp/vsa/src/VSAExample.cpp b/examples/cpp/vsa/src/VSAExample.cpp
index 481c2d5..a288efc 100644
--- a/examples/cpp/vsa/src/VSAExample.cpp
+++ b/examples/cpp/vsa/src/VSAExample.cpp
@@ -36,7 +36,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
 				// Short Ethernet
 				{
 					auto frame = std::make_shared<icsneo::EthernetMessage>();
-					frame->network = icsneo::Network::NetID::Ethernet;
+					frame->network = icsneo::Network::_icsneo_netid_t::Ethernet;
 					frames.push_back(frame);
 					frame->data.resize(ShortEthSize);
 					std::generate(frame->data.begin(), frame->data.end(), randByteGen);
@@ -46,7 +46,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
 				// Long Ethernet
 				{
 					auto frame = std::make_shared<icsneo::EthernetMessage>();
-					frame->network = icsneo::Network::NetID::Ethernet;
+					frame->network = icsneo::Network::_icsneo_netid_t::Ethernet;
 					frames.push_back(frame);
 					frame->data.resize(LongEthSize);
 					std::generate(frame->data.begin(), frame->data.end(), randByteGen);
@@ -56,7 +56,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
 				// Classic CAN
 				{
 					auto frame = std::make_shared<icsneo::CANMessage>();
-					frame->network = icsneo::Network::NetID::HSCAN2;
+					frame->network = icsneo::Network::_icsneo_netid_t::HSCAN2;
 					frames.push_back(frame);
 					frame->data.resize(ClassicCANSize);
 
@@ -67,7 +67,7 @@ std::vector<std::shared_ptr<icsneo::BusMessage>> constructRandomFrames(size_t fr
 				// CAN FD
 				{
 					auto frame = std::make_shared<icsneo::CANMessage>();
-					frame->network = icsneo::Network::NetID::HSCAN3;
+					frame->network = icsneo::Network::_icsneo_netid_t::HSCAN3;
 					frames.push_back(frame);
 					frame->data.resize(CANFDSize);
 					std::generate(frame->data.begin(), frame->data.end(), randByteGen);
diff --git a/include/icsneo/communication/message/apperrormessage.h b/include/icsneo/communication/message/apperrormessage.h
index e3dbc62..a5bfcd9 100644
--- a/include/icsneo/communication/message/apperrormessage.h
+++ b/include/icsneo/communication/message/apperrormessage.h
@@ -66,9 +66,9 @@ enum class AppErrorType : uint16_t {
 
 class AppErrorMessage : public InternalMessage {
 public:
-	AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::NetID::RED_App_Error) {}
+	AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::_icsneo_netid_t::RED_App_Error) {}
 	uint16_t errorType;
-	Network::NetID errorNetID;
+	Network::_icsneo_netid_t errorNetID;
 	uint32_t timestamp10us;
 	uint32_t timestamp10usMSB;
 
diff --git a/include/icsneo/communication/message/diskdatamessage.h b/include/icsneo/communication/message/diskdatamessage.h
index 899f1a8..66abbc6 100644
--- a/include/icsneo/communication/message/diskdatamessage.h
+++ b/include/icsneo/communication/message/diskdatamessage.h
@@ -9,7 +9,7 @@ namespace icsneo {
 
 class DiskDataMessage : public InternalMessage {
 public:
-	DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(Network::NetID::DiskData) {
+	DiskDataMessage(std::vector<uint8_t>&& d) : InternalMessage(Network::_icsneo_netid_t::icsneo_netid_disk_data) {
 		data = std::move(d);
 	}
 };
diff --git a/include/icsneo/communication/message/filter/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h
index 61e6322..0f7e2e3 100644
--- a/include/icsneo/communication/message/filter/messagefilter.h
+++ b/include/icsneo/communication/message/filter/messagefilter.h
@@ -13,8 +13,8 @@ class MessageFilter {
 public:
 	MessageFilter() {}
 	MessageFilter(Message::Type type) : includeInternalInAny(neomessagetype_t(type) & 0x8000), messageType(type) {}
-	MessageFilter(Network::NetID netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step
-	MessageFilter(icsneo_msg_bus_type_t type, Network::NetID net = Network::NetID::Any) : networkType(type), netid(net) {
+	MessageFilter(Network::_icsneo_netid_t netid) : MessageFilter(Network::GetTypeOfNetID(netid, false), netid) {} // Messages on the communication layer are never encoded as VNET ID + common ID, so skip the expansion step
+	MessageFilter(icsneo_msg_bus_type_t type, Network::_icsneo_netid_t net = Network::_icsneo_netid_t::Any) : networkType(type), netid(net) {
 		// If a icsneo_msg_bus_type_internal is used, we want to also get internal Message::Types
 		// The NetID we want may be in there
 		includeInternalInAny = (networkType == icsneo_msg_bus_type_internal);
@@ -34,7 +34,7 @@ public:
 				return false;
 			if(!matchNetID(frame->network.getNetID()))
 				return false;
-		} else if (netid != Network::NetID::Any || networkType != icsneo_msg_bus_type_any) {
+		} else if (netid != Network::_icsneo_netid_t::Any || networkType != icsneo_msg_bus_type_any) {
 			return false; // Filtering on a NetID or Type, but this message doesn't have one
 		}
 		return true;
@@ -55,9 +55,9 @@ protected:
 		return networkType == mtype;
 	}
 
-	Network::NetID netid = Network::NetID::Any;
-	bool matchNetID(Network::NetID mnetid) const {
-		if(netid == Network::NetID::Any)
+	Network::_icsneo_netid_t netid = Network::_icsneo_netid_t::Any;
+	bool matchNetID(Network::_icsneo_netid_t mnetid) const {
+		if(netid == Network::_icsneo_netid_t::Any)
 			return true;
 		return netid == mnetid;
 	}
diff --git a/include/icsneo/communication/message/flashmemorymessage.h b/include/icsneo/communication/message/flashmemorymessage.h
index 175345f..fae4a40 100644
--- a/include/icsneo/communication/message/flashmemorymessage.h
+++ b/include/icsneo/communication/message/flashmemorymessage.h
@@ -9,7 +9,7 @@ namespace icsneo {
 
 class FlashMemoryMessage : public InternalMessage {
 public:
-	FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::RED_INT_MEMORYREAD) {}
+	FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_red_int_memoryread) {}
 	uint16_t startAddress = 0;
 };
 
diff --git a/include/icsneo/communication/message/livedatamessage.h b/include/icsneo/communication/message/livedatamessage.h
index 87554a9..49b55a7 100644
--- a/include/icsneo/communication/message/livedatamessage.h
+++ b/include/icsneo/communication/message/livedatamessage.h
@@ -10,7 +10,7 @@
 namespace icsneo {
 class LiveDataMessage : public InternalMessage {
 public:
-	LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::NetID::ExtendedCommand) {}
+	LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::_icsneo_netid_t::ExtendedCommand) {}
 	LiveDataHandle handle;
 	LiveDataCommand cmd;
 };
diff --git a/include/icsneo/communication/message/main51message.h b/include/icsneo/communication/message/main51message.h
index 1f2d288..bc2f30d 100644
--- a/include/icsneo/communication/message/main51message.h
+++ b/include/icsneo/communication/message/main51message.h
@@ -10,7 +10,7 @@ namespace icsneo {
 
 class Main51Message : public InternalMessage {
 public:
-	Main51Message() : InternalMessage(Message::Type::Main51, Network::NetID::Main51) {}
+	Main51Message() : InternalMessage(Message::Type::Main51, Network::_icsneo_netid_t::icsneo_netid_main51) {}
 	Command command = Command(0);
 	bool forceShortFormat = false; // Necessary for EnableNetworkCom and EnableNetworkComEx
 };
diff --git a/include/icsneo/communication/message/neomessage.h b/include/icsneo/communication/message/neomessage.h
index d6c0574..9c9446f 100644
--- a/include/icsneo/communication/message/neomessage.h
+++ b/include/icsneo/communication/message/neomessage.h
@@ -115,7 +115,7 @@ typedef struct {
 	uint8_t _reserved1[16];
 	uint64_t timestamp;
 	uint64_t _reservedTimestamp;
-	uint8_t _reserved2[sizeof(size_t) * 2 + 7 + sizeof(neonetid_t) + sizeof(icsneo_msg_bus_type_t)];
+	uint8_t _reserved2[sizeof(size_t) * 2 + 7 + sizeof(icsneo_netid_t) + sizeof(icsneo_msg_bus_type_t)];
 	neomessagetype_t messageType;
 	uint8_t _reserved3[12];
 } neomessage_t; // 72 bytes total
@@ -128,7 +128,7 @@ typedef struct {
 	const uint8_t* data;
 	size_t length;
 	uint8_t header[4];
-	neonetid_t netid;
+	icsneo_netid_t netid;
 	icsneo_msg_bus_type_t type;
 	uint8_t _reserved0;
 	uint16_t description;
@@ -143,7 +143,7 @@ typedef struct {
 	const uint8_t* data;
 	size_t length;
 	uint32_t arbid;
-	neonetid_t netid;
+	icsneo_netid_t netid;
 	icsneo_msg_bus_type_t type;
 	uint8_t dlcOnWire;
 	uint16_t description;
@@ -159,7 +159,7 @@ typedef struct {
 	uint8_t transmitErrorCount;
 	uint8_t receiveErrorCount;
 	uint8_t _reserved3[5];
-	neonetid_t netid;
+	icsneo_netid_t netid;
 	icsneo_msg_bus_type_t type;
 	neomessagetype_t messageType;
 	uint8_t _reserved4[12];
@@ -173,7 +173,7 @@ typedef struct {
 	size_t length;
 	uint8_t preemptionFlags;
 	uint8_t _reservedHeader[3];
-	neonetid_t netid;
+	icsneo_netid_t netid;
 	icsneo_msg_bus_type_t type;
 	uint8_t _reserved0;
 	uint16_t description;
@@ -199,7 +199,7 @@ typedef struct {
 	const uint8_t* data;
 	size_t length;
 	uint8_t header[4];
-	neonetid_t netid;
+	icsneo_netid_t netid;
 	icsneo_msg_bus_type_t type;
 	neomessage_linstatus_t linStatus;
 	uint16_t description;
diff --git a/include/icsneo/communication/message/neoreadmemorysdmessage.h b/include/icsneo/communication/message/neoreadmemorysdmessage.h
index 008069f..e28ff23 100644
--- a/include/icsneo/communication/message/neoreadmemorysdmessage.h
+++ b/include/icsneo/communication/message/neoreadmemorysdmessage.h
@@ -9,7 +9,7 @@ namespace icsneo {
 
 class NeoReadMemorySDMessage : public InternalMessage {
 public:
-	NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::NeoMemorySDRead) {}
+	NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::_icsneo_netid_t::icsneo_netid_neo_memory_sdread) {}
 	uint32_t startAddress = 0;
 };
 
diff --git a/include/icsneo/communication/message/readsettingsmessage.h b/include/icsneo/communication/message/readsettingsmessage.h
index d2625ca..4c12ee5 100644
--- a/include/icsneo/communication/message/readsettingsmessage.h
+++ b/include/icsneo/communication/message/readsettingsmessage.h
@@ -10,7 +10,7 @@ namespace icsneo {
 
 class ReadSettingsMessage : public InternalMessage {
 public:
-	ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::NetID::ReadSettings) {}
+	ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::_icsneo_netid_t::ReadSettings) {}
 	
 	enum class Response : uint8_t {
 		OK = 0,
diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h
index 83d014b..d7b27b7 100644
--- a/include/icsneo/communication/network.h
+++ b/include/icsneo/communication/network.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <icsneo/icsneotypes.h>
 
-typedef uint16_t neonetid_t;
+typedef uint16_t icsneo_netid_t;
 
 #ifdef __cplusplus
 
@@ -23,43 +23,43 @@ class Network {
 	static constexpr uint16_t OFFSET_PLASMA_SLAVE3_RANGE2 = 12800;
 
 public:
-	enum class NetID : neonetid_t {
-		Device = 0,
-		HSCAN = 1,
-		MSCAN = 2,
-		SWCAN = 3,
-		LSFTCAN = 4,
-		FordSCP = 5,
-		J1708 = 6,
-		Aux = 7,
-		J1850VPW = 8,
-		ISO9141 = 9,
-		DiskData = 10,
-		Main51 = 11,
-		RED = 12,
-		SCI = 13,
-		ISO9141_2 = 14,
-		ISO14230 = 15,
-		LIN = 16,
-		OP_Ethernet1 = 17,
-		OP_Ethernet2 = 18,
-		OP_Ethernet3 = 19,
+	enum class _icsneo_netid_t : icsneo_netid_t {
+		icsneo_netid_device = 0,
+		icsneo_netid_hscan = 1,
+		icsneo_netid_mscan = 2,
+		icsneo_netid_swcan = 3,
+		icsneo_netid_lsftcan = 4,
+		icsneo_netid_fordscp = 5,
+		icsneo_netid_j1708 = 6,
+		icsneo_netid_aux = 7,
+		icsneo_netid_j1850vpw = 8,
+		icsneo_netid_iso9141 = 9,
+		icsneo_netid_disk_data = 10,
+		icsneo_netid_main51 = 11,
+		icsneo_netid_red = 12,
+		icsneo_netid_sci = 13,
+		icsneo_netid_iso9141_2 = 14,
+		icsneo_netid_iso14230 = 15,
+		icsneo_netid_lin = 16,
+		icsneo_netid_op_ethernet1 = 17,
+		icsneo_netid_op_ethernet2 = 18,
+		icsneo_netid_op_ethernet3 = 19,
 
 		// START Device Command Returns
 		// When we send a command, the device returns on one of these, depending on command
-		RED_EXT_MEMORYREAD = 20,
-		RED_INT_MEMORYREAD = 21,
-		RED_DFLASH_READ = 22,
-		NeoMemorySDRead = 23, // Response from NeoMemory (MemoryTypeSD)
-		CAN_ERRBITS = 24,
-		NeoMemoryWriteDone = 25,
-		RED_WAVE_CAN1_LOGICAL = 26,
-		RED_WAVE_CAN2_LOGICAL = 27,
-		RED_WAVE_LIN1_LOGICAL = 28,
-		RED_WAVE_LIN2_LOGICAL = 29,
-		RED_WAVE_LIN1_ANALOG = 30,
-		RED_WAVE_LIN2_ANALOG = 31,
-		RED_WAVE_MISC_ANALOG = 32,
+		icsneo_netid_red_ext_memoryread = 20,
+		icsneo_netid_red_int_memoryread = 21,
+		icsneo_netid_red_dflash_read = 22,
+		icsneo_netid_neo_memory_sdread = 23, // Response from NeoMemory (MemoryTypeSD)
+		icsneo_netid_can_errbits = 24,
+		icsneo_netid_neo_memory_write_done = 25,
+		icsneo_netid_red_wave_can1_logical = 26,
+		icsneo_netid_red_wave_can2_logical = 27,
+		icsneo_netid_red_wave_lin1_logical = 28,
+		icsneo_netid_red_wave_lin2_logical = 29,
+		icsneo_netid_red_wave_lin1_analog = 30,
+		icsneo_netid_red_wave_lin2_analog = 31,
+		icsneo_netid_red_wave_misc_analog = 32,
 		RED_WAVE_MISCDIO2_LOGICAL = 33,
 		RED_NETWORK_COM_ENABLE_EX = 34,
 		RED_NEOVI_NETWORK = 35,
@@ -336,148 +336,148 @@ public:
 	 * the offset from OFFSET_PLASMA_SLAVE2, return the vnet agnostic
 	 * netid so caller can commonize handlers without caring about WHICH slave.
 	 */
-	static NetID OffsetToSimpleNetworkId(uint16_t offset) {
+	static _icsneo_netid_t OffsetToSimpleNetworkId(uint16_t offset) {
 		switch(offset) {
 		default:
 		case 0:
-			return NetID::Device;
+			return _icsneo_netid_t::icsneo_netid_device;
 		case 1:
-			return NetID::HSCAN;
+			return _icsneo_netid_t::icsneo_netid_hscan;
 		case 2:
-			return NetID::MSCAN;
+			return _icsneo_netid_t::icsneo_netid_mscan;
 		case 3:
-			return NetID::SWCAN;
+			return _icsneo_netid_t::icsneo_netid_swcan;
 		case 4:
-			return NetID::LSFTCAN;
+			return _icsneo_netid_t::icsneo_netid_lsftcan;
 		case 5:
-			return NetID::FordSCP;
+			return _icsneo_netid_t::icsneo_netid_fordscp;
 		case 6:
-			return NetID::J1708;
+			return _icsneo_netid_t::icsneo_netid_j1708;
 		case 7:
-			return NetID::Aux;
+			return _icsneo_netid_t::icsneo_netid_aux;
 		case 8:
-			return NetID::J1850VPW;
+			return _icsneo_netid_t::icsneo_netid_j1850vpw;
 		case 9:
-			return NetID::ISO9141;
+			return _icsneo_netid_t::icsneo_netid_iso9141;
 		case 10:
-			return NetID::DiskData;
+			return _icsneo_netid_t::icsneo_netid_disk_data;
 		case 11:
-			return NetID::Main51;
+			return _icsneo_netid_t::icsneo_netid_main51;
 		case 12:
-			return NetID::RED;
+			return _icsneo_netid_t::icsneo_netid_red;
 		case 13:
-			return NetID::SCI;
+			return _icsneo_netid_t::icsneo_netid_sci;
 		case 14:
-			return NetID::ISO9141_2;
+			return _icsneo_netid_t::icsneo_netid_iso9141_2;
 		case 15:
-			return NetID::ISO14230;
+			return _icsneo_netid_t::icsneo_netid_iso14230;
 		case 16:
-			return NetID::LIN;
+			return _icsneo_netid_t::icsneo_netid_lin;
 		case 17:
-			return NetID::ISO9141_3;
+			return _icsneo_netid_t::ISO9141_3;
 		case 18:
-			return NetID::HSCAN2;
+			return _icsneo_netid_t::HSCAN2;
 		case 19:
-			return NetID::HSCAN3;
+			return _icsneo_netid_t::HSCAN3;
 		case 20:
-			return NetID::ISO9141_4;
+			return _icsneo_netid_t::ISO9141_4;
 		case 21:
-			return NetID::LIN2;
+			return _icsneo_netid_t::LIN2;
 		case 22:
-			return NetID::LIN3;
+			return _icsneo_netid_t::LIN3;
 		case 23:
-			return NetID::LIN4;
+			return _icsneo_netid_t::LIN4;
 		//case 24:
 		//	return NetID::MOST;	// Deprecated
 		case 25:
-			return NetID::CGI;
+			return _icsneo_netid_t::CGI;
 		case 26:
-			return NetID::I2C;
+			return _icsneo_netid_t::I2C;
 		case 27:
-			return NetID::SPI1;
+			return _icsneo_netid_t::SPI1;
 		case 28:
-			return NetID::FlexRay1a;
+			return _icsneo_netid_t::FlexRay1a;
 		case 29:
-			return NetID::MOST25;
+			return _icsneo_netid_t::MOST25;
 		case 30:
-			return NetID::MOST50;
+			return _icsneo_netid_t::MOST50;
 		case 31:
-			return NetID::MOST150;
+			return _icsneo_netid_t::MOST150;
 		case 32:
-			return NetID::HSCAN4;
+			return _icsneo_netid_t::HSCAN4;
 		case 33:
-			return NetID::HSCAN5;
+			return _icsneo_netid_t::HSCAN5;
 		case 34:
-			return NetID::RS232;
+			return _icsneo_netid_t::RS232;
 		case 35:
-			return NetID::UART;
+			return _icsneo_netid_t::UART;
 		case 36:
-			return NetID::UART2;
+			return _icsneo_netid_t::UART2;
 		case 37:
-			return NetID::UART3;
+			return _icsneo_netid_t::UART3;
 		case 38:
-			return NetID::UART4;
+			return _icsneo_netid_t::UART4;
 		case 39:
-			return NetID::SWCAN2;
+			return _icsneo_netid_t::SWCAN2;
 		case 40:
-			return NetID::FlexRay1b;
+			return _icsneo_netid_t::FlexRay1b;
 		case 41:
-			return NetID::FlexRay2a;
+			return _icsneo_netid_t::FlexRay2a;
 		case 42:
-			return NetID::FlexRay2b;
+			return _icsneo_netid_t::FlexRay2b;
 		case 43:
-			return NetID::LIN5;
+			return _icsneo_netid_t::LIN5;
 		case 44:
-			return NetID::Ethernet;
+			return _icsneo_netid_t::Ethernet;
 		case 45:
-			return NetID::Ethernet_DAQ;
+			return _icsneo_netid_t::Ethernet_DAQ;
 		case 46:
-			return NetID::RED_App_Error;
+			return _icsneo_netid_t::RED_App_Error;
 		case 47:
-			return NetID::HSCAN6;
+			return _icsneo_netid_t::HSCAN6;
 		case 48:
-			return NetID::HSCAN7;
+			return _icsneo_netid_t::HSCAN7;
 		case 49:
-			return NetID::LIN6;
+			return _icsneo_netid_t::LIN6;
 		case 50:
-			return NetID::LSFTCAN2;
+			return _icsneo_netid_t::LSFTCAN2;
 		}
 	}
-	static bool Within(neonetid_t value, neonetid_t min, neonetid_t max) {
+	static bool Within(icsneo_netid_t value, icsneo_netid_t min, icsneo_netid_t max) {
 		return ((min <= value) && (value < max));
 	}
-	static bool IdIsSlaveARange1(neonetid_t fullNetid) {
+	static bool IdIsSlaveARange1(icsneo_netid_t fullNetid) {
 		return Within(fullNetid, OFFSET_PLASMA_SLAVE1, OFFSET_PLASMA_SLAVE1 + COUNT_PLASMA_SLAVE);
 	}
-	static bool IdIsSlaveARange2(neonetid_t fullNetid) {
+	static bool IdIsSlaveARange2(icsneo_netid_t fullNetid) {
 		return Within(fullNetid, OFFSET_PLASMA_SLAVE1_RANGE2, OFFSET_PLASMA_SLAVE2_RANGE2);
 	}
-	static bool IdIsSlaveBRange1(neonetid_t fullNetid) {
+	static bool IdIsSlaveBRange1(icsneo_netid_t fullNetid) {
 		return Within(fullNetid, OFFSET_PLASMA_SLAVE2, OFFSET_PLASMA_SLAVE2 + COUNT_PLASMA_SLAVE);
 	}
-	static bool IdIsSlaveBRange2(neonetid_t fullNetid) {
+	static bool IdIsSlaveBRange2(icsneo_netid_t fullNetid) {
 		return Within(fullNetid, OFFSET_PLASMA_SLAVE2_RANGE2, OFFSET_PLASMA_SLAVE3_RANGE2);
 	}
-	static std::pair<VnetId, NetID> GetVnetAgnosticNetid(neonetid_t fullNetid) {
+	static std::pair<VnetId, _icsneo_netid_t> GetVnetAgnosticNetid(icsneo_netid_t fullNetid) {
 		VnetId vnetId = VnetId::None;
-		NetID netId;
+		_icsneo_netid_t netId;
 
 		if(fullNetid < OFFSET_PLASMA_SLAVE1) {
-			netId = static_cast<NetID>(fullNetid);
+			netId = static_cast<_icsneo_netid_t>(fullNetid);
 		} else if(IdIsSlaveARange1(fullNetid)) {
 			netId = OffsetToSimpleNetworkId(fullNetid - OFFSET_PLASMA_SLAVE1);
 			vnetId = VnetId::VNET_A;
 		} else if(IdIsSlaveARange2(fullNetid)) {
-			netId = static_cast<NetID>((fullNetid - OFFSET_PLASMA_SLAVE1_RANGE2));
+			netId = static_cast<_icsneo_netid_t>((fullNetid - OFFSET_PLASMA_SLAVE1_RANGE2));
 			vnetId = VnetId::VNET_A;
 		} else if(IdIsSlaveBRange1(fullNetid)) {
 			netId = OffsetToSimpleNetworkId(fullNetid - OFFSET_PLASMA_SLAVE2);
 			vnetId = VnetId::VNET_B;
 		} else if(IdIsSlaveBRange2(fullNetid)) {
-			netId = static_cast<NetID>((fullNetid - OFFSET_PLASMA_SLAVE2_RANGE2));
+			netId = static_cast<_icsneo_netid_t>((fullNetid - OFFSET_PLASMA_SLAVE2_RANGE2));
 			vnetId = VnetId::VNET_B;
 		} else {
-			netId = static_cast<NetID>(fullNetid);
+			netId = static_cast<_icsneo_netid_t>(fullNetid);
 		}
 
 		return std::make_pair(vnetId, netId);
@@ -493,881 +493,881 @@ public:
 		}
 		return "Invalid VNET ID";
 	}
-	static icsneo_msg_bus_type_t GetTypeOfNetID(NetID netid, bool expand = true) {
+	static icsneo_msg_bus_type_t GetTypeOfNetID(_icsneo_netid_t netid, bool expand = true) {
 		if(expand) {
-			netid = GetVnetAgnosticNetid((neonetid_t)netid).second;
+			netid = GetVnetAgnosticNetid((icsneo_netid_t)netid).second;
 		}
 
 		switch(netid) {
-		case NetID::HSCAN:
-		case NetID::MSCAN:
-		case NetID::HSCAN2:
-		case NetID::HSCAN3:
-		case NetID::HSCAN4:
-		case NetID::HSCAN5:
-		case NetID::HSCAN6:
-		case NetID::HSCAN7:
-		case NetID::DWCAN9:
-		case NetID::DWCAN10:
-		case NetID::DWCAN11:
-		case NetID::DWCAN12:
-		case NetID::DWCAN13:
-		case NetID::DWCAN14:
-		case NetID::DWCAN15:
-		case NetID::DWCAN16:
+		case _icsneo_netid_t::icsneo_netid_hscan:
+		case _icsneo_netid_t::icsneo_netid_mscan:
+		case _icsneo_netid_t::HSCAN2:
+		case _icsneo_netid_t::HSCAN3:
+		case _icsneo_netid_t::HSCAN4:
+		case _icsneo_netid_t::HSCAN5:
+		case _icsneo_netid_t::HSCAN6:
+		case _icsneo_netid_t::HSCAN7:
+		case _icsneo_netid_t::DWCAN9:
+		case _icsneo_netid_t::DWCAN10:
+		case _icsneo_netid_t::DWCAN11:
+		case _icsneo_netid_t::DWCAN12:
+		case _icsneo_netid_t::DWCAN13:
+		case _icsneo_netid_t::DWCAN14:
+		case _icsneo_netid_t::DWCAN15:
+		case _icsneo_netid_t::DWCAN16:
 			return icsneo_msg_bus_type_can;
-		case NetID::LIN:
-		case NetID::LIN2:
-		case NetID::LIN3:
-		case NetID::LIN4:
-		case NetID::LIN5:
-		case NetID::LIN6:
-		case NetID::LIN7:
-		case NetID::LIN8:
-		case NetID::LIN9:
-		case NetID::LIN10:
-		case NetID::LIN11:
-		case NetID::LIN12:
-		case NetID::LIN13:
-		case NetID::LIN14:
-		case NetID::LIN15:
-		case NetID::LIN16:
+		case _icsneo_netid_t::icsneo_netid_lin:
+		case _icsneo_netid_t::LIN2:
+		case _icsneo_netid_t::LIN3:
+		case _icsneo_netid_t::LIN4:
+		case _icsneo_netid_t::LIN5:
+		case _icsneo_netid_t::LIN6:
+		case _icsneo_netid_t::LIN7:
+		case _icsneo_netid_t::LIN8:
+		case _icsneo_netid_t::LIN9:
+		case _icsneo_netid_t::LIN10:
+		case _icsneo_netid_t::LIN11:
+		case _icsneo_netid_t::LIN12:
+		case _icsneo_netid_t::LIN13:
+		case _icsneo_netid_t::LIN14:
+		case _icsneo_netid_t::LIN15:
+		case _icsneo_netid_t::LIN16:
 			return icsneo_msg_bus_type_lin;
-		case NetID::FlexRay:
-		case NetID::FlexRay1a:
-		case NetID::FlexRay1b:
-		case NetID::FlexRay2:
-		case NetID::FlexRay2a:
-		case NetID::FlexRay2b:
+		case _icsneo_netid_t::FlexRay:
+		case _icsneo_netid_t::FlexRay1a:
+		case _icsneo_netid_t::FlexRay1b:
+		case _icsneo_netid_t::FlexRay2:
+		case _icsneo_netid_t::FlexRay2a:
+		case _icsneo_netid_t::FlexRay2b:
 			return icsneo_msg_bus_type_flexray;
-		case NetID::MOST25:
-		case NetID::MOST50:
-		case NetID::MOST150:
+		case _icsneo_netid_t::MOST25:
+		case _icsneo_netid_t::MOST50:
+		case _icsneo_netid_t::MOST150:
 			return icsneo_msg_bus_type_most;
-		case NetID::RED:
-		case NetID::RED_OLDFORMAT:
-		case NetID::Device:
-		case NetID::Reset_Status:
-		case NetID::DeviceStatus:
-		case NetID::FlexRayControl:
-		case NetID::Main51:
-		case NetID::ReadSettings:
-		case NetID::LogicalDiskInfo:
-		case NetID::WiVICommand:
-		case NetID::ScriptStatus:
-		case NetID::EthPHYControl:
-		case NetID::CoreMiniPreLoad:
-		case NetID::ExtendedCommand:
-		case NetID::ExtendedData:
-		case NetID::RED_INT_MEMORYREAD:
-		case NetID::NeoMemorySDRead:
-		case NetID::NeoMemoryWriteDone:
-		case NetID::RED_GET_RTC:
-		case NetID::DiskData:
-		case NetID::RED_App_Error:
+		case _icsneo_netid_t::icsneo_netid_red:
+		case _icsneo_netid_t::RED_OLDFORMAT:
+		case _icsneo_netid_t::icsneo_netid_device:
+		case _icsneo_netid_t::Reset_Status:
+		case _icsneo_netid_t::DeviceStatus:
+		case _icsneo_netid_t::FlexRayControl:
+		case _icsneo_netid_t::icsneo_netid_main51:
+		case _icsneo_netid_t::ReadSettings:
+		case _icsneo_netid_t::LogicalDiskInfo:
+		case _icsneo_netid_t::WiVICommand:
+		case _icsneo_netid_t::ScriptStatus:
+		case _icsneo_netid_t::EthPHYControl:
+		case _icsneo_netid_t::CoreMiniPreLoad:
+		case _icsneo_netid_t::ExtendedCommand:
+		case _icsneo_netid_t::ExtendedData:
+		case _icsneo_netid_t::icsneo_netid_red_int_memoryread:
+		case _icsneo_netid_t::icsneo_netid_neo_memory_sdread:
+		case _icsneo_netid_t::icsneo_netid_neo_memory_write_done:
+		case _icsneo_netid_t::RED_GET_RTC:
+		case _icsneo_netid_t::icsneo_netid_disk_data:
+		case _icsneo_netid_t::RED_App_Error:
 			return icsneo_msg_bus_type_internal;
-		case NetID::Invalid:
-		case NetID::Any:
+		case _icsneo_netid_t::Invalid:
+		case _icsneo_netid_t::Any:
 			return icsneo_msg_bus_type_invalid;
-		case NetID::Ethernet:
-		case NetID::Ethernet_DAQ:
-		case NetID::Ethernet2:
-		case NetID::Ethernet3:
-		case NetID::OP_Ethernet1:
-		case NetID::OP_Ethernet2:
-		case NetID::OP_Ethernet3:
-		case NetID::OP_Ethernet4:
-		case NetID::OP_Ethernet5:
-		case NetID::OP_Ethernet6:
-		case NetID::OP_Ethernet7:
-		case NetID::OP_Ethernet8:
-		case NetID::OP_Ethernet9:
-		case NetID::OP_Ethernet10:
-		case NetID::OP_Ethernet11:
-		case NetID::OP_Ethernet12:
-		case NetID::OP_Ethernet13:
-		case NetID::OP_Ethernet14:
-		case NetID::OP_Ethernet15:
-		case NetID::OP_Ethernet16:
+		case _icsneo_netid_t::Ethernet:
+		case _icsneo_netid_t::Ethernet_DAQ:
+		case _icsneo_netid_t::Ethernet2:
+		case _icsneo_netid_t::Ethernet3:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet1:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet2:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet3:
+		case _icsneo_netid_t::OP_Ethernet4:
+		case _icsneo_netid_t::OP_Ethernet5:
+		case _icsneo_netid_t::OP_Ethernet6:
+		case _icsneo_netid_t::OP_Ethernet7:
+		case _icsneo_netid_t::OP_Ethernet8:
+		case _icsneo_netid_t::OP_Ethernet9:
+		case _icsneo_netid_t::OP_Ethernet10:
+		case _icsneo_netid_t::OP_Ethernet11:
+		case _icsneo_netid_t::OP_Ethernet12:
+		case _icsneo_netid_t::OP_Ethernet13:
+		case _icsneo_netid_t::OP_Ethernet14:
+		case _icsneo_netid_t::OP_Ethernet15:
+		case _icsneo_netid_t::OP_Ethernet16:
 			return icsneo_msg_bus_type_ethernet;
-		case NetID::LSFTCAN:
-		case NetID::LSFTCAN2:
+		case _icsneo_netid_t::icsneo_netid_lsftcan:
+		case _icsneo_netid_t::LSFTCAN2:
 			return icsneo_msg_bus_type_lsftcan;
-		case NetID::SWCAN:
-		case NetID::SWCAN2:
+		case _icsneo_netid_t::icsneo_netid_swcan:
+		case _icsneo_netid_t::SWCAN2:
 			return icsneo_msg_bus_type_swcan;
-		case NetID::ISO9141:
-		case NetID::ISO9141_2:
-		case NetID::ISO9141_3:
-		case NetID::ISO9141_4:
+		case _icsneo_netid_t::icsneo_netid_iso9141:
+		case _icsneo_netid_t::icsneo_netid_iso9141_2:
+		case _icsneo_netid_t::ISO9141_3:
+		case _icsneo_netid_t::ISO9141_4:
 			return icsneo_msg_bus_type_iso9141;
-		case NetID::I2C:
-		case NetID::I2C2:
-		case NetID::I2C3:
-		case NetID::I2C4:
+		case _icsneo_netid_t::I2C:
+		case _icsneo_netid_t::I2C2:
+		case _icsneo_netid_t::I2C3:
+		case _icsneo_netid_t::I2C4:
 			return icsneo_msg_bus_type_i2c;
-		case NetID::A2B1:
-		case NetID::A2B2:
+		case _icsneo_netid_t::A2B1:
+		case _icsneo_netid_t::A2B2:
 			return icsneo_msg_bus_type_a2b;
-		case NetID::SPI1:
-		case NetID::SPI2:
-		case NetID::SPI3:
-		case NetID::SPI4:
-		case NetID::SPI5:
-		case NetID::SPI6:
-		case NetID::SPI7:
-		case NetID::SPI8:
+		case _icsneo_netid_t::SPI1:
+		case _icsneo_netid_t::SPI2:
+		case _icsneo_netid_t::SPI3:
+		case _icsneo_netid_t::SPI4:
+		case _icsneo_netid_t::SPI5:
+		case _icsneo_netid_t::SPI6:
+		case _icsneo_netid_t::SPI7:
+		case _icsneo_netid_t::SPI8:
 			return icsneo_msg_bus_type_spi;
-		case NetID::MDIO1:
-		case NetID::MDIO2:
-		case NetID::MDIO3:
-		case NetID::MDIO4:
-		case NetID::MDIO5:
-		case NetID::MDIO6:
-		case NetID::MDIO7:
-		case NetID::MDIO8:
+		case _icsneo_netid_t::MDIO1:
+		case _icsneo_netid_t::MDIO2:
+		case _icsneo_netid_t::MDIO3:
+		case _icsneo_netid_t::MDIO4:
+		case _icsneo_netid_t::MDIO5:
+		case _icsneo_netid_t::MDIO6:
+		case _icsneo_netid_t::MDIO7:
+		case _icsneo_netid_t::MDIO8:
 			return icsneo_msg_bus_type_mdio;
 		default:
 			return icsneo_msg_bus_type_other;
 		}
 	}
-	static const char* GetNetIDString(NetID netid, bool expand = true) {
+	static const char* GetNetIDString(_icsneo_netid_t netid, bool expand = true) {
 		if(expand) {
-			netid = GetVnetAgnosticNetid((neonetid_t)netid).second;
+			netid = GetVnetAgnosticNetid((icsneo_netid_t)netid).second;
 		}
 		switch(netid) {
-		case NetID::Device:
+		case _icsneo_netid_t::icsneo_netid_device:
 			return "neoVI";
-		case NetID::HSCAN:
+		case _icsneo_netid_t::icsneo_netid_hscan:
 			return "HSCAN";
-		case NetID::MSCAN:
+		case _icsneo_netid_t::icsneo_netid_mscan:
 			return "MSCAN";
-		case NetID::SWCAN:
+		case _icsneo_netid_t::icsneo_netid_swcan:
 			return "SWCAN";
-		case NetID::LSFTCAN:
+		case _icsneo_netid_t::icsneo_netid_lsftcan:
 			return "LSFTCAN";
-		case NetID::FordSCP:
+		case _icsneo_netid_t::icsneo_netid_fordscp:
 			return "FordSCP";
-		case NetID::J1708:
+		case _icsneo_netid_t::icsneo_netid_j1708:
 			return "J1708";
-		case NetID::Aux:
+		case _icsneo_netid_t::icsneo_netid_aux:
 			return "Aux";
-		case NetID::J1850VPW:
+		case _icsneo_netid_t::icsneo_netid_j1850vpw:
 			return "J1850 VPW";
-		case NetID::ISO9141:
+		case _icsneo_netid_t::icsneo_netid_iso9141:
 			return "ISO 9141";
-		case NetID::DiskData:
+		case _icsneo_netid_t::icsneo_netid_disk_data:
 			return "Disk Data";
-		case NetID::Main51:
+		case _icsneo_netid_t::icsneo_netid_main51:
 			return "Main51";
-		case NetID::RED:
+		case _icsneo_netid_t::icsneo_netid_red:
 			return "RED";
-		case NetID::SCI:
+		case _icsneo_netid_t::icsneo_netid_sci:
 			return "SCI";
-		case NetID::ISO9141_2:
+		case _icsneo_netid_t::icsneo_netid_iso9141_2:
 			return "ISO 9141 2";
-		case NetID::ISO14230:
+		case _icsneo_netid_t::icsneo_netid_iso14230:
 			return "ISO 14230";
-		case NetID::LIN:
+		case _icsneo_netid_t::icsneo_netid_lin:
 			return "LIN";
-		case NetID::OP_Ethernet1:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet1:
 			return "OP (BR) Ethernet 1";
-		case NetID::OP_Ethernet2:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet2:
 			return "OP (BR) Ethernet 2";
-		case NetID::OP_Ethernet3:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet3:
 			return "OP (BR) Ethernet 3";
-		case NetID::RED_EXT_MEMORYREAD:
+		case _icsneo_netid_t::icsneo_netid_red_ext_memoryread:
 			return "RED_EXT_MEMORYREAD";
-		case NetID::RED_INT_MEMORYREAD:
+		case _icsneo_netid_t::icsneo_netid_red_int_memoryread:
 			return "RED_INT_MEMORYREAD";
-		case NetID::RED_DFLASH_READ:
+		case _icsneo_netid_t::icsneo_netid_red_dflash_read:
 			return "RED_DFLASH_READ";
-		case NetID::NeoMemorySDRead:
+		case _icsneo_netid_t::icsneo_netid_neo_memory_sdread:
 			return "NeoMemorySDRead";
-		case NetID::CAN_ERRBITS:
+		case _icsneo_netid_t::icsneo_netid_can_errbits:
 			return "CAN_ERRBITS";
-		case NetID::NeoMemoryWriteDone:
+		case _icsneo_netid_t::icsneo_netid_neo_memory_write_done:
 			return "NeoMemoryWriteDone";
-		case NetID::RED_WAVE_CAN1_LOGICAL:
+		case _icsneo_netid_t::icsneo_netid_red_wave_can1_logical:
 			return "RED_WAVE_CAN1_LOGICAL";
-		case NetID::RED_WAVE_CAN2_LOGICAL:
+		case _icsneo_netid_t::icsneo_netid_red_wave_can2_logical:
 			return "RED_WAVE_CAN2_LOGICAL";
-		case NetID::RED_WAVE_LIN1_LOGICAL:
+		case _icsneo_netid_t::icsneo_netid_red_wave_lin1_logical:
 			return "RED_WAVE_LIN1_LOGICAL";
-		case NetID::RED_WAVE_LIN2_LOGICAL:
+		case _icsneo_netid_t::icsneo_netid_red_wave_lin2_logical:
 			return "RED_WAVE_LIN2_LOGICAL";
-		case NetID::RED_WAVE_LIN1_ANALOG:
+		case _icsneo_netid_t::icsneo_netid_red_wave_lin1_analog:
 			return "RED_WAVE_LIN1_ANALOG";
-		case NetID::RED_WAVE_LIN2_ANALOG:
+		case _icsneo_netid_t::icsneo_netid_red_wave_lin2_analog:
 			return "RED_WAVE_LIN2_ANALOG";
-		case NetID::RED_WAVE_MISC_ANALOG:
+		case _icsneo_netid_t::icsneo_netid_red_wave_misc_analog:
 			return "RED_WAVE_MISC_ANALOG";
-		case NetID::RED_WAVE_MISCDIO2_LOGICAL:
+		case _icsneo_netid_t::RED_WAVE_MISCDIO2_LOGICAL:
 			return "RED_WAVE_MISCDIO2_LOGICAL";
-		case NetID::RED_NETWORK_COM_ENABLE_EX:
+		case _icsneo_netid_t::RED_NETWORK_COM_ENABLE_EX:
 			return "RED_NETWORK_COM_ENABLE_EX";
-		case NetID::RED_NEOVI_NETWORK:
+		case _icsneo_netid_t::RED_NEOVI_NETWORK:
 			return "RED_NEOVI_NETWORK";
-		case NetID::RED_READ_BAUD_SETTINGS:
+		case _icsneo_netid_t::RED_READ_BAUD_SETTINGS:
 			return "RED_READ_BAUD_SETTINGS";
-		case NetID::RED_OLDFORMAT:
+		case _icsneo_netid_t::RED_OLDFORMAT:
 			return "RED_OLDFORMAT";
-		case NetID::RED_SCOPE_CAPTURE:
+		case _icsneo_netid_t::RED_SCOPE_CAPTURE:
 			return "RED_SCOPE_CAPTURE";
-		case NetID::RED_HARDWARE_EXCEP:
+		case _icsneo_netid_t::RED_HARDWARE_EXCEP:
 			return "RED_HARDWARE_EXCEP";
-		case NetID::RED_GET_RTC:
+		case _icsneo_netid_t::RED_GET_RTC:
 			return "RED_GET_RTC";
-		case NetID::ISO9141_3:
+		case _icsneo_netid_t::ISO9141_3:
 			return "ISO 9141 3";
-		case NetID::HSCAN2:
+		case _icsneo_netid_t::HSCAN2:
 			return "HSCAN 2";
-		case NetID::HSCAN3:
+		case _icsneo_netid_t::HSCAN3:
 			return "HSCAN 3";
-		case NetID::OP_Ethernet4:
+		case _icsneo_netid_t::OP_Ethernet4:
 			return "OP (BR) Ethernet 4";
-		case NetID::OP_Ethernet5:
+		case _icsneo_netid_t::OP_Ethernet5:
 			return "OP (BR) Ethernet 5";
-		case NetID::ISO9141_4:
+		case _icsneo_netid_t::ISO9141_4:
 			return "ISO 9141 4";
-		case NetID::LIN2:
+		case _icsneo_netid_t::LIN2:
 			return "LIN 2";
-		case NetID::LIN3:
+		case _icsneo_netid_t::LIN3:
 			return "LIN 3";
-		case NetID::LIN4:
+		case _icsneo_netid_t::LIN4:
 			return "LIN 4";
-		case NetID::RED_App_Error:
+		case _icsneo_netid_t::RED_App_Error:
 			return "App Error";
-		case NetID::CGI:
+		case _icsneo_netid_t::CGI:
 			return "CGI";
-		case NetID::Reset_Status:
+		case _icsneo_netid_t::Reset_Status:
 			return "Reset Status";
-		case NetID::FB_Status:
+		case _icsneo_netid_t::FB_Status:
 			return "FB Status";
-		case NetID::App_Signal_Status:
+		case _icsneo_netid_t::App_Signal_Status:
 			return "App Signal Status";
-		case NetID::Read_Datalink_Cm_Tx_Msg:
+		case _icsneo_netid_t::Read_Datalink_Cm_Tx_Msg:
 			return "Read Datalink Cm Tx Msg";
-		case NetID::Read_Datalink_Cm_Rx_Msg:
+		case _icsneo_netid_t::Read_Datalink_Cm_Rx_Msg:
 			return "Read Datalink Cm Rx Msg";
-		case NetID::Logging_Overflow:
+		case _icsneo_netid_t::Logging_Overflow:
 			return "Logging Overflow";
-		case NetID::ReadSettings:
+		case _icsneo_netid_t::ReadSettings:
 			return "Read Settings";
-		case NetID::HSCAN4:
+		case _icsneo_netid_t::HSCAN4:
 			return "HSCAN 4";
-		case NetID::HSCAN5:
+		case _icsneo_netid_t::HSCAN5:
 			return "HSCAN 5";
-		case NetID::RS232:
+		case _icsneo_netid_t::RS232:
 			return "RS232";
-		case NetID::UART:
+		case _icsneo_netid_t::UART:
 			return "UART";
-		case NetID::UART2:
+		case _icsneo_netid_t::UART2:
 			return "UART 2";
-		case NetID::UART3:
+		case _icsneo_netid_t::UART3:
 			return "UART 3";
-		case NetID::UART4:
+		case _icsneo_netid_t::UART4:
 			return "UART 4";
-		case NetID::SWCAN2:
+		case _icsneo_netid_t::SWCAN2:
 			return "SWCAN 2";
-		case NetID::Ethernet_DAQ:
+		case _icsneo_netid_t::Ethernet_DAQ:
 			return "Ethernet DAQ";
-		case NetID::Data_To_Host:
+		case _icsneo_netid_t::Data_To_Host:
 			return "Data To Host";
-		case NetID::TextAPI_To_Host:
+		case _icsneo_netid_t::TextAPI_To_Host:
 			return "TextAPI To Host";
-		case NetID::OP_Ethernet6:
+		case _icsneo_netid_t::OP_Ethernet6:
 			return "OP (BR) Ethernet 6";
-		case NetID::Red_VBat:
+		case _icsneo_netid_t::Red_VBat:
 			return "Red VBat";
-		case NetID::OP_Ethernet7:
+		case _icsneo_netid_t::OP_Ethernet7:
 			return "OP (BR) Ethernet 7";
-		case NetID::OP_Ethernet8:
+		case _icsneo_netid_t::OP_Ethernet8:
 			return "OP (BR) Ethernet 8";
-		case NetID::OP_Ethernet9:
+		case _icsneo_netid_t::OP_Ethernet9:
 			return "OP (BR) Ethernet 9";
-		case NetID::OP_Ethernet10:
+		case _icsneo_netid_t::OP_Ethernet10:
 			return "OP (BR) Ethernet 10";
-		case NetID::OP_Ethernet11:
+		case _icsneo_netid_t::OP_Ethernet11:
 			return "OP (BR) Ethernet 11";
-		case NetID::FlexRay1a:
+		case _icsneo_netid_t::FlexRay1a:
 			return "FlexRay 1a";
-		case NetID::FlexRay1b:
+		case _icsneo_netid_t::FlexRay1b:
 			return "FlexRay 1b";
-		case NetID::FlexRay2a:
+		case _icsneo_netid_t::FlexRay2a:
 			return "FlexRay 2a";
-		case NetID::FlexRay2b:
+		case _icsneo_netid_t::FlexRay2b:
 			return "FlexRay 2b";
-		case NetID::LIN5:
+		case _icsneo_netid_t::LIN5:
 			return "LIN 5";
-		case NetID::FlexRay:
+		case _icsneo_netid_t::FlexRay:
 			return "FlexRay";
-		case NetID::FlexRay2:
+		case _icsneo_netid_t::FlexRay2:
 			return "FlexRay 2";
-		case NetID::OP_Ethernet12:
+		case _icsneo_netid_t::OP_Ethernet12:
 			return "OP (BR) Ethernet 12";
-		case NetID::OP_Ethernet13:
+		case _icsneo_netid_t::OP_Ethernet13:
 			return "OP (BR) Ethernet 13";
-		case NetID::OP_Ethernet14:
+		case _icsneo_netid_t::OP_Ethernet14:
 			return "OP (BR) Ethernet 14";
-		case NetID::OP_Ethernet15:
+		case _icsneo_netid_t::OP_Ethernet15:
 			return "OP (BR) Ethernet 15";
-		case NetID::OP_Ethernet16:
+		case _icsneo_netid_t::OP_Ethernet16:
 			return "OP (BR) Ethernet 16";
-		case NetID::I2C:
+		case _icsneo_netid_t::I2C:
 			return "I2C";
-		case NetID::MOST25:
+		case _icsneo_netid_t::MOST25:
 			return "MOST25";
-		case NetID::MOST50:
+		case _icsneo_netid_t::MOST50:
 			return "MOST50";
-		case NetID::MOST150:
+		case _icsneo_netid_t::MOST150:
 			return "MOST150";
-		case NetID::Ethernet:
+		case _icsneo_netid_t::Ethernet:
 			return "Ethernet";
-		case NetID::GMFSA:
+		case _icsneo_netid_t::GMFSA:
 			return "GMFSA";
-		case NetID::TCP:
+		case _icsneo_netid_t::TCP:
 			return "TCP";
-		case NetID::HSCAN6:
+		case _icsneo_netid_t::HSCAN6:
 			return "HSCAN 6";
-		case NetID::HSCAN7:
+		case _icsneo_netid_t::HSCAN7:
 			return "HSCAN 7";
-		case NetID::LIN6:
+		case _icsneo_netid_t::LIN6:
 			return "LIN 6";
-		case NetID::LSFTCAN2:
+		case _icsneo_netid_t::LSFTCAN2:
 			return "LSFTCAN 2";
-		case NetID::LogicalDiskInfo:
+		case _icsneo_netid_t::LogicalDiskInfo:
 			return "Logical Disk Information";
-		case NetID::WiVICommand:
+		case _icsneo_netid_t::WiVICommand:
 			return "WiVI Command";
-		case NetID::ScriptStatus:
+		case _icsneo_netid_t::ScriptStatus:
 			return "Script Status";
-		case NetID::CoreMiniPreLoad:
+		case _icsneo_netid_t::CoreMiniPreLoad:
 			return "CoreMini PreLoad";
-		case NetID::EthPHYControl:
+		case _icsneo_netid_t::EthPHYControl:
 			return "Ethernet PHY Register Control";
-		case NetID::ExtendedCommand:
+		case _icsneo_netid_t::ExtendedCommand:
 			return "Extended Command";
-		case NetID::ExtendedData:
+		case _icsneo_netid_t::ExtendedData:
 			return "Extended Data";
-		case NetID::FlexRayControl:
+		case _icsneo_netid_t::FlexRayControl:
 			return "FlexRay Control";
-		case NetID::HW_COM_Latency_Test:
+		case _icsneo_netid_t::HW_COM_Latency_Test:
 			return "HW COM Latency Test";
-		case NetID::DeviceStatus:
+		case _icsneo_netid_t::DeviceStatus:
 			return "Device Status";
-		case NetID::UDP:
+		case _icsneo_netid_t::UDP:
 			return "UDP";
-		case NetID::ForwardedMessage:
+		case _icsneo_netid_t::ForwardedMessage:
 			return "Forwarded Message";
-		case NetID::I2C2:
+		case _icsneo_netid_t::I2C2:
 			return "I2C 2";
-		case NetID::I2C3:
+		case _icsneo_netid_t::I2C3:
 			return "I2C 3";
-		case NetID::I2C4:
+		case _icsneo_netid_t::I2C4:
 			return "I2C 4";
-		case NetID::Ethernet2:
+		case _icsneo_netid_t::Ethernet2:
 			return "Ethernet 2";
-		case NetID::A2B1:
+		case _icsneo_netid_t::A2B1:
 			return "A2B 1";
-		case NetID::A2B2:
+		case _icsneo_netid_t::A2B2:
 			return "A2B 2";
-		case NetID::DWCAN9:
+		case _icsneo_netid_t::DWCAN9:
 			return "DWCAN 09";
-		case NetID::DWCAN10:
+		case _icsneo_netid_t::DWCAN10:
 			return "DWCAN 10";
-		case NetID::DWCAN11:
+		case _icsneo_netid_t::DWCAN11:
 			return "DWCAN 11";
-		case NetID::DWCAN12:
+		case _icsneo_netid_t::DWCAN12:
 			return "DWCAN 12";
-		case NetID::DWCAN13:
+		case _icsneo_netid_t::DWCAN13:
 			return "DWCAN 13";
-		case NetID::DWCAN14:
+		case _icsneo_netid_t::DWCAN14:
 			return "DWCAN 14";
-		case NetID::DWCAN15:
+		case _icsneo_netid_t::DWCAN15:
 			return "DWCAN 15";
-		case NetID::DWCAN16:
+		case _icsneo_netid_t::DWCAN16:
 			return "DWCAN 16";
-		case NetID::Ethernet3:
+		case _icsneo_netid_t::Ethernet3:
 			return "Ethernet 03";
-		case NetID::LIN7:
+		case _icsneo_netid_t::LIN7:
 			return "LIN 07";
-		case NetID::LIN8:
+		case _icsneo_netid_t::LIN8:
 			return "LIN 08";
-		case NetID::LIN9:
+		case _icsneo_netid_t::LIN9:
 			return "LIN 09";
-		case NetID::LIN10:
+		case _icsneo_netid_t::LIN10:
 			return "LIN 10";
-		case NetID::LIN11:
+		case _icsneo_netid_t::LIN11:
 			return "LIN 11";
-		case NetID::LIN12:
+		case _icsneo_netid_t::LIN12:
 			return "LIN 12";
-		case NetID::LIN13:
+		case _icsneo_netid_t::LIN13:
 			return "LIN 13";
-		case NetID::LIN14:
+		case _icsneo_netid_t::LIN14:
 			return "LIN 14";
-		case NetID::LIN15:
+		case _icsneo_netid_t::LIN15:
 			return "LIN 15";
-		case NetID::LIN16:
+		case _icsneo_netid_t::LIN16:
 			return "LIN 16";
-		case NetID::WBMS:
+		case _icsneo_netid_t::WBMS:
 			return "WBMS";
-		case NetID::SPI1:
+		case _icsneo_netid_t::SPI1:
 			return "SPI 1";
-		case NetID::SPI2:
+		case _icsneo_netid_t::SPI2:
 			return "SPI 2";
-		case NetID::SPI3:
+		case _icsneo_netid_t::SPI3:
 			return "SPI 3";
-		case NetID::SPI4:
+		case _icsneo_netid_t::SPI4:
 			return "SPI 4";
-		case NetID::SPI5:
+		case _icsneo_netid_t::SPI5:
 			return "SPI 5";
-		case NetID::SPI6:
+		case _icsneo_netid_t::SPI6:
 			return "SPI 6";
-		case NetID::SPI7:
+		case _icsneo_netid_t::SPI7:
 			return "SPI 7";
-		case NetID::SPI8:
+		case _icsneo_netid_t::SPI8:
 			return "SPI 8";
-		case NetID::MDIO1:
+		case _icsneo_netid_t::MDIO1:
 			return "MDIO 1";
-		case NetID::MDIO2:
+		case _icsneo_netid_t::MDIO2:
 			return "MDIO 2";
-		case NetID::MDIO3:
+		case _icsneo_netid_t::MDIO3:
 			return "MDIO 3";
-		case NetID::MDIO4:
+		case _icsneo_netid_t::MDIO4:
 			return "MDIO 4";
-		case NetID::MDIO5:
+		case _icsneo_netid_t::MDIO5:
 			return "MDIO 5";
-		case NetID::MDIO6:
+		case _icsneo_netid_t::MDIO6:
 			return "MDIO 6";
-		case NetID::MDIO7:
+		case _icsneo_netid_t::MDIO7:
 			return "MDIO 7";
-		case NetID::MDIO8:
+		case _icsneo_netid_t::MDIO8:
 			return "MDIO 8";
-		case NetID::Any:
-		case NetID::Invalid:
+		case _icsneo_netid_t::Any:
+		case _icsneo_netid_t::Invalid:
 			break;
 		}
 		return "Invalid Network";
 	}
-	static std::optional<CoreMini> GetCoreMiniNetworkFromNetID(NetID netid) {
+	static std::optional<CoreMini> GetCoreMiniNetworkFromNetID(_icsneo_netid_t netid) {
 		switch(netid) {
-		case NetID::HSCAN:
+		case _icsneo_netid_t::icsneo_netid_hscan:
 			return CoreMini::HSCAN;
-		case NetID::MSCAN:
+		case _icsneo_netid_t::icsneo_netid_mscan:
 			return CoreMini::MSCAN;
-		case NetID::LIN:
+		case _icsneo_netid_t::icsneo_netid_lin:
 			return CoreMini::LIN;
-		case NetID::LIN2:
+		case _icsneo_netid_t::LIN2:
 			return CoreMini::LIN2;
-		case NetID::Device:
+		case _icsneo_netid_t::icsneo_netid_device:
 			return CoreMini::Virtual;
-		case NetID::HSCAN2:
+		case _icsneo_netid_t::HSCAN2:
 			return CoreMini::HSCAN2;
-		case NetID::LSFTCAN:
+		case _icsneo_netid_t::icsneo_netid_lsftcan:
 			return CoreMini::LSFTCAN;
-		case NetID::SWCAN:
+		case _icsneo_netid_t::icsneo_netid_swcan:
 			return CoreMini::SWCAN;
-		case NetID::HSCAN3:
+		case _icsneo_netid_t::HSCAN3:
 			return CoreMini::HSCAN3;
-		case NetID::CGI:
+		case _icsneo_netid_t::CGI:
 			return CoreMini::CGI;
-		case NetID::J1850VPW:
+		case _icsneo_netid_t::icsneo_netid_j1850vpw:
 			return CoreMini::J1850VPW;
-		case NetID::LIN3:
+		case _icsneo_netid_t::LIN3:
 			return CoreMini::LIN3;
-		case NetID::LIN4:
+		case _icsneo_netid_t::LIN4:
 			return CoreMini::LIN4;
-		case NetID::J1708:
+		case _icsneo_netid_t::icsneo_netid_j1708:
 			return CoreMini::J1708;
-		case NetID::HSCAN4:
+		case _icsneo_netid_t::HSCAN4:
 			return CoreMini::HSCAN4;
-		case NetID::HSCAN5:
+		case _icsneo_netid_t::HSCAN5:
 			return CoreMini::HSCAN5;
-		case NetID::ISO9141:
+		case _icsneo_netid_t::icsneo_netid_iso9141:
 			return CoreMini::KLine1;
-		case NetID::ISO9141_2:
+		case _icsneo_netid_t::icsneo_netid_iso9141_2:
 			return CoreMini::KLine2;
-		case NetID::ISO9141_3:
+		case _icsneo_netid_t::ISO9141_3:
 			return CoreMini::KLine3;
-		case NetID::ISO9141_4:
+		case _icsneo_netid_t::ISO9141_4:
 			return CoreMini::KLine4;
-		case NetID::FlexRay1a:
+		case _icsneo_netid_t::FlexRay1a:
 			return CoreMini::FlexRay1a;
-		case NetID::UART:
+		case _icsneo_netid_t::UART:
 			return CoreMini::UART;
-		case NetID::UART2:
+		case _icsneo_netid_t::UART2:
 			return CoreMini::UART2;
-		case NetID::LIN5:
+		case _icsneo_netid_t::LIN5:
 			return CoreMini::LIN5;
-		case NetID::MOST25:
+		case _icsneo_netid_t::MOST25:
 			return CoreMini::MOST25;
-		case NetID::MOST50:
+		case _icsneo_netid_t::MOST50:
 			return CoreMini::MOST50;
-		case NetID::FlexRay1b:
+		case _icsneo_netid_t::FlexRay1b:
 			return CoreMini::FlexRay1b;
-		case NetID::SWCAN2:
+		case _icsneo_netid_t::SWCAN2:
 			return CoreMini::SWCAN2;
-		case NetID::Ethernet_DAQ:
+		case _icsneo_netid_t::Ethernet_DAQ:
 			return CoreMini::EthernetDAQ;
-		case NetID::Ethernet:
+		case _icsneo_netid_t::Ethernet:
 			return CoreMini::Ethernet;
-		case NetID::FlexRay2a:
+		case _icsneo_netid_t::FlexRay2a:
 			return CoreMini::FlexRay2a;
-		case NetID::FlexRay2b:
+		case _icsneo_netid_t::FlexRay2b:
 			return CoreMini::FlexRay2b;
-		case NetID::HSCAN6:
+		case _icsneo_netid_t::HSCAN6:
 			return CoreMini::HSCAN6;
-		case NetID::HSCAN7:
+		case _icsneo_netid_t::HSCAN7:
 			return CoreMini::HSCAN7;
-		case NetID::LIN6:
+		case _icsneo_netid_t::LIN6:
 			return CoreMini::LIN6;
-		case NetID::LSFTCAN2:
+		case _icsneo_netid_t::LSFTCAN2:
 			return CoreMini::LSFTCAN2;
-		case NetID::OP_Ethernet1:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet1:
 			return CoreMini::OP_Ethernet1;
-		case NetID::OP_Ethernet2:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet2:
 			return CoreMini::OP_Ethernet2;
-		case NetID::OP_Ethernet3:
+		case _icsneo_netid_t::icsneo_netid_op_ethernet3:
 			return CoreMini::OP_Ethernet3;
-		case NetID::OP_Ethernet4:
+		case _icsneo_netid_t::OP_Ethernet4:
 			return CoreMini::OP_Ethernet4;
-		case NetID::OP_Ethernet5:
+		case _icsneo_netid_t::OP_Ethernet5:
 			return CoreMini::OP_Ethernet5;
-		case NetID::OP_Ethernet6:
+		case _icsneo_netid_t::OP_Ethernet6:
 			return CoreMini::OP_Ethernet6;
-		case NetID::OP_Ethernet7:
+		case _icsneo_netid_t::OP_Ethernet7:
 			return CoreMini::OP_Ethernet7;
-		case NetID::OP_Ethernet8:
+		case _icsneo_netid_t::OP_Ethernet8:
 			return CoreMini::OP_Ethernet8;
-		case NetID::OP_Ethernet9:
+		case _icsneo_netid_t::OP_Ethernet9:
 			return CoreMini::OP_Ethernet9;
-		case NetID::OP_Ethernet10:
+		case _icsneo_netid_t::OP_Ethernet10:
 			return CoreMini::OP_Ethernet10;
-		case NetID::OP_Ethernet11:
+		case _icsneo_netid_t::OP_Ethernet11:
 			return CoreMini::OP_Ethernet11;
-		case NetID::OP_Ethernet12:
+		case _icsneo_netid_t::OP_Ethernet12:
 			return CoreMini::OP_Ethernet12;
-		case NetID::OP_Ethernet13:
+		case _icsneo_netid_t::OP_Ethernet13:
 			return CoreMini::OP_Ethernet13;
-		case NetID::OP_Ethernet14:
+		case _icsneo_netid_t::OP_Ethernet14:
 			return CoreMini::OP_Ethernet14;
-		case NetID::OP_Ethernet15:
+		case _icsneo_netid_t::OP_Ethernet15:
 			return CoreMini::OP_Ethernet15;
-		case NetID::OP_Ethernet16:
+		case _icsneo_netid_t::OP_Ethernet16:
 			return CoreMini::OP_Ethernet16;
-		case NetID::TCP:
+		case _icsneo_netid_t::TCP:
 			return CoreMini::TCPVirtual;
-		case NetID::UDP:
+		case _icsneo_netid_t::UDP:
 			return CoreMini::UDPVirtual;
-		case NetID::FlexRay:
+		case _icsneo_netid_t::FlexRay:
 			return CoreMini::FlexRay1;
-		case NetID::FlexRay2:
+		case _icsneo_netid_t::FlexRay2:
 			return CoreMini::FlexRay2;
-		case NetID::ForwardedMessage:
+		case _icsneo_netid_t::ForwardedMessage:
 			return CoreMini::ForwardedMessage;
-		case NetID::I2C:
+		case _icsneo_netid_t::I2C:
 			return CoreMini::I2C1;
-		case NetID::I2C2:
+		case _icsneo_netid_t::I2C2:
 			return CoreMini::I2C2;
-		case NetID::I2C3:
+		case _icsneo_netid_t::I2C3:
 			return CoreMini::I2C3;
-		case NetID::I2C4:
+		case _icsneo_netid_t::I2C4:
 			return CoreMini::I2C4;
-		case NetID::Ethernet2:
+		case _icsneo_netid_t::Ethernet2:
 			return CoreMini::Ethernet2;
-		case NetID::A2B1:
+		case _icsneo_netid_t::A2B1:
 			return CoreMini::A2B1;
-		case NetID::A2B2:
+		case _icsneo_netid_t::A2B2:
 			return CoreMini::A2B2;
-		case NetID::Ethernet3:
+		case _icsneo_netid_t::Ethernet3:
 			return CoreMini::Ethernet3;
-		case NetID::WBMS:
+		case _icsneo_netid_t::WBMS:
 			return CoreMini::WBMS;
-		case NetID::DWCAN9:
+		case _icsneo_netid_t::DWCAN9:
 			return CoreMini::DWCAN9;
-		case NetID::DWCAN10:
+		case _icsneo_netid_t::DWCAN10:
 			return CoreMini::DWCAN10;
-		case NetID::DWCAN11:
+		case _icsneo_netid_t::DWCAN11:
 			return CoreMini::DWCAN11;
-		case NetID::DWCAN12:
+		case _icsneo_netid_t::DWCAN12:
 			return CoreMini::DWCAN12;
-		case NetID::DWCAN13:
+		case _icsneo_netid_t::DWCAN13:
 			return CoreMini::DWCAN13;
-		case NetID::DWCAN14:
+		case _icsneo_netid_t::DWCAN14:
 			return CoreMini::DWCAN14;
-		case NetID::DWCAN15:
+		case _icsneo_netid_t::DWCAN15:
 			return CoreMini::DWCAN15;
-		case NetID::DWCAN16:
+		case _icsneo_netid_t::DWCAN16:
 			return CoreMini::DWCAN16;
-		case NetID::LIN7:
+		case _icsneo_netid_t::LIN7:
 			return CoreMini::LIN7;
-		case NetID::LIN8:
+		case _icsneo_netid_t::LIN8:
 			return CoreMini::LIN8;
-		case NetID::LIN9:
+		case _icsneo_netid_t::LIN9:
 			return CoreMini::LIN9;
-		case NetID::LIN10:
+		case _icsneo_netid_t::LIN10:
 			return CoreMini::LIN10;
-		case NetID::LIN11:
+		case _icsneo_netid_t::LIN11:
 			return CoreMini::LIN11;
-		case NetID::LIN12:
+		case _icsneo_netid_t::LIN12:
 			return CoreMini::LIN12;
-		case NetID::LIN13:
+		case _icsneo_netid_t::LIN13:
 			return CoreMini::LIN13;
-		case NetID::LIN14:
+		case _icsneo_netid_t::LIN14:
 			return CoreMini::LIN14;
-		case NetID::LIN15:
+		case _icsneo_netid_t::LIN15:
 			return CoreMini::LIN15;
-		case NetID::LIN16:
+		case _icsneo_netid_t::LIN16:
 			return CoreMini::LIN16;
-		case NetID::SPI1:
+		case _icsneo_netid_t::SPI1:
 			return CoreMini::SPI1;
-		case NetID::SPI2:
+		case _icsneo_netid_t::SPI2:
 			return CoreMini::SPI2;
-		case NetID::SPI3:
+		case _icsneo_netid_t::SPI3:
 			return CoreMini::SPI3;
-		case NetID::SPI4:
+		case _icsneo_netid_t::SPI4:
 			return CoreMini::SPI4;
-		case NetID::SPI5:
+		case _icsneo_netid_t::SPI5:
 			return CoreMini::SPI5;
-		case NetID::SPI6:
+		case _icsneo_netid_t::SPI6:
 			return CoreMini::SPI6;
-		case NetID::SPI7:
+		case _icsneo_netid_t::SPI7:
 			return CoreMini::SPI7;
-		case NetID::SPI8:
+		case _icsneo_netid_t::SPI8:
 			return CoreMini::SPI8;
-		case NetID::MDIO1:
+		case _icsneo_netid_t::MDIO1:
 			return CoreMini::MDIO1;
-		case NetID::MDIO2:
+		case _icsneo_netid_t::MDIO2:
 			return CoreMini::MDIO2;
-		case NetID::MDIO3:
+		case _icsneo_netid_t::MDIO3:
 			return CoreMini::MDIO3;
-		case NetID::MDIO4:
+		case _icsneo_netid_t::MDIO4:
 			return CoreMini::MDIO4;
-		case NetID::MDIO5:
+		case _icsneo_netid_t::MDIO5:
 			return CoreMini::MDIO5;
-		case NetID::MDIO6:
+		case _icsneo_netid_t::MDIO6:
 			return CoreMini::MDIO6;
-		case NetID::MDIO7:
+		case _icsneo_netid_t::MDIO7:
 			return CoreMini::MDIO7;
-		case NetID::MDIO8:
+		case _icsneo_netid_t::MDIO8:
 			return CoreMini::MDIO8;
 		default:
 			return std::nullopt;
 		}
 	}
-	static NetID GetNetIDFromCoreMiniNetwork(CoreMini cm) {
+	static _icsneo_netid_t GetNetIDFromCoreMiniNetwork(CoreMini cm) {
 		switch(cm) {
 		case CoreMini::HSCAN:
-			return NetID::HSCAN;
+			return _icsneo_netid_t::icsneo_netid_hscan;
 		case CoreMini::MSCAN:
-			return NetID::MSCAN;
+			return _icsneo_netid_t::icsneo_netid_mscan;
 		case CoreMini::LIN:
-			return NetID::LIN;
+			return _icsneo_netid_t::icsneo_netid_lin;
 		case CoreMini::LIN2:
-			return NetID::LIN2;
+			return _icsneo_netid_t::LIN2;
 		case CoreMini::Virtual:
-			return NetID::Device;
+			return _icsneo_netid_t::icsneo_netid_device;
 		case CoreMini::HSCAN2:
-			return NetID::HSCAN2;
+			return _icsneo_netid_t::HSCAN2;
 		case CoreMini::LSFTCAN:
-			return NetID::LSFTCAN;
+			return _icsneo_netid_t::icsneo_netid_lsftcan;
 		case CoreMini::SWCAN:
-			return NetID::SWCAN;
+			return _icsneo_netid_t::icsneo_netid_swcan;
 		case CoreMini::HSCAN3:
-			return NetID::HSCAN3;
+			return _icsneo_netid_t::HSCAN3;
 		case CoreMini::CGI:
-			return NetID::CGI;
+			return _icsneo_netid_t::CGI;
 		case CoreMini::J1850VPW:
-			return NetID::J1850VPW;
+			return _icsneo_netid_t::icsneo_netid_j1850vpw;
 		case CoreMini::LIN3:
-			return NetID::LIN3;
+			return _icsneo_netid_t::LIN3;
 		case CoreMini::LIN4:
-			return NetID::LIN4;
+			return _icsneo_netid_t::LIN4;
 		case CoreMini::J1708:
-			return NetID::J1708;
+			return _icsneo_netid_t::icsneo_netid_j1708;
 		case CoreMini::HSCAN4:
-			return NetID::HSCAN4;
+			return _icsneo_netid_t::HSCAN4;
 		case CoreMini::HSCAN5:
-			return NetID::HSCAN5;
+			return _icsneo_netid_t::HSCAN5;
 		case CoreMini::KLine1:
-			return NetID::ISO9141;
+			return _icsneo_netid_t::icsneo_netid_iso9141;
 		case CoreMini::KLine2:
-			return NetID::ISO9141_2;
+			return _icsneo_netid_t::icsneo_netid_iso9141_2;
 		case CoreMini::KLine3:
-			return NetID::ISO9141_3;
+			return _icsneo_netid_t::ISO9141_3;
 		case CoreMini::KLine4:
-			return NetID::ISO9141_4;
+			return _icsneo_netid_t::ISO9141_4;
 		case CoreMini::FlexRay1a:
-			return NetID::FlexRay1a;
+			return _icsneo_netid_t::FlexRay1a;
 		case CoreMini::UART:
-			return NetID::UART;
+			return _icsneo_netid_t::UART;
 		case CoreMini::UART2:
-			return NetID::UART2;
+			return _icsneo_netid_t::UART2;
 		case CoreMini::LIN5:
-			return NetID::LIN5;
+			return _icsneo_netid_t::LIN5;
 		case CoreMini::MOST25:
-			return NetID::MOST25;
+			return _icsneo_netid_t::MOST25;
 		case CoreMini::MOST50:
-			return NetID::MOST50;
+			return _icsneo_netid_t::MOST50;
 		case CoreMini::FlexRay1b:
-			return NetID::FlexRay1b;
+			return _icsneo_netid_t::FlexRay1b;
 		case CoreMini::SWCAN2:
-			return NetID::SWCAN2;
+			return _icsneo_netid_t::SWCAN2;
 		case CoreMini::EthernetDAQ:
-			return NetID::Ethernet_DAQ;
+			return _icsneo_netid_t::Ethernet_DAQ;
 		case CoreMini::Ethernet:
-			return NetID::Ethernet;
+			return _icsneo_netid_t::Ethernet;
 		case CoreMini::FlexRay2a:
-			return NetID::FlexRay2a;
+			return _icsneo_netid_t::FlexRay2a;
 		case CoreMini::FlexRay2b:
-			return NetID::FlexRay2b;
+			return _icsneo_netid_t::FlexRay2b;
 		case CoreMini::HSCAN6:
-			return NetID::HSCAN6;
+			return _icsneo_netid_t::HSCAN6;
 		case CoreMini::HSCAN7:
-			return NetID::HSCAN7;
+			return _icsneo_netid_t::HSCAN7;
 		case CoreMini::LIN6:
-			return NetID::LIN6;
+			return _icsneo_netid_t::LIN6;
 		case CoreMini::LSFTCAN2:
-			return NetID::LSFTCAN2;
+			return _icsneo_netid_t::LSFTCAN2;
 		case CoreMini::OP_Ethernet1:
-			return NetID::OP_Ethernet1;
+			return _icsneo_netid_t::icsneo_netid_op_ethernet1;
 		case CoreMini::OP_Ethernet2:
-			return NetID::OP_Ethernet2;
+			return _icsneo_netid_t::icsneo_netid_op_ethernet2;
 		case CoreMini::OP_Ethernet3:
-			return NetID::OP_Ethernet3;
+			return _icsneo_netid_t::icsneo_netid_op_ethernet3;
 		case CoreMini::OP_Ethernet4:
-			return NetID::OP_Ethernet4;
+			return _icsneo_netid_t::OP_Ethernet4;
 		case CoreMini::OP_Ethernet5:
-			return NetID::OP_Ethernet5;
+			return _icsneo_netid_t::OP_Ethernet5;
 		case CoreMini::OP_Ethernet6:
-			return NetID::OP_Ethernet6;
+			return _icsneo_netid_t::OP_Ethernet6;
 		case CoreMini::OP_Ethernet7:
-			return NetID::OP_Ethernet7;
+			return _icsneo_netid_t::OP_Ethernet7;
 		case CoreMini::OP_Ethernet8:
-			return NetID::OP_Ethernet8;
+			return _icsneo_netid_t::OP_Ethernet8;
 		case CoreMini::OP_Ethernet9:
-			return NetID::OP_Ethernet9;
+			return _icsneo_netid_t::OP_Ethernet9;
 		case CoreMini::OP_Ethernet10:
-			return NetID::OP_Ethernet10;
+			return _icsneo_netid_t::OP_Ethernet10;
 		case CoreMini::OP_Ethernet11:
-			return NetID::OP_Ethernet11;
+			return _icsneo_netid_t::OP_Ethernet11;
 		case CoreMini::OP_Ethernet12:
-			return NetID::OP_Ethernet12;
+			return _icsneo_netid_t::OP_Ethernet12;
 		case CoreMini::OP_Ethernet13:
-			return NetID::OP_Ethernet13;
+			return _icsneo_netid_t::OP_Ethernet13;
 		case CoreMini::OP_Ethernet14:
-			return NetID::OP_Ethernet14;
+			return _icsneo_netid_t::OP_Ethernet14;
 		case CoreMini::OP_Ethernet15:
-			return NetID::OP_Ethernet15;
+			return _icsneo_netid_t::OP_Ethernet15;
 		case CoreMini::OP_Ethernet16:
-			return NetID::OP_Ethernet16;
+			return _icsneo_netid_t::OP_Ethernet16;
 		case CoreMini::TCPVirtual:
-			return NetID::TCP;
+			return _icsneo_netid_t::TCP;
 		case CoreMini::UDPVirtual:
-			return NetID::UDP;
+			return _icsneo_netid_t::UDP;
 		case CoreMini::FlexRay1:
-			return NetID::FlexRay;
+			return _icsneo_netid_t::FlexRay;
 		case CoreMini::FlexRay2:
-			return NetID::FlexRay2;
+			return _icsneo_netid_t::FlexRay2;
 		case CoreMini::ForwardedMessage:
-			return NetID::ForwardedMessage;
+			return _icsneo_netid_t::ForwardedMessage;
 		case CoreMini::I2C1:
-			return NetID::I2C;
+			return _icsneo_netid_t::I2C;
 		case CoreMini::I2C2:
-			return NetID::I2C2;
+			return _icsneo_netid_t::I2C2;
 		case CoreMini::I2C3:
-			return NetID::I2C3;
+			return _icsneo_netid_t::I2C3;
 		case CoreMini::I2C4:
-			return NetID::I2C4;
+			return _icsneo_netid_t::I2C4;
 		case CoreMini::Ethernet2:
-			return NetID::Ethernet2;
+			return _icsneo_netid_t::Ethernet2;
 		case CoreMini::A2B1:
-			return NetID::A2B1;
+			return _icsneo_netid_t::A2B1;
 		case CoreMini::A2B2:
-			return NetID::A2B2;
+			return _icsneo_netid_t::A2B2;
 		case CoreMini::Ethernet3:
-			return NetID::Ethernet3;
+			return _icsneo_netid_t::Ethernet3;
 		case CoreMini::WBMS:
-			return NetID::WBMS;
+			return _icsneo_netid_t::WBMS;
 		case CoreMini::DWCAN9:
-			return NetID::DWCAN9;
+			return _icsneo_netid_t::DWCAN9;
 		case CoreMini::DWCAN10:
-			return NetID::DWCAN10;
+			return _icsneo_netid_t::DWCAN10;
 		case CoreMini::DWCAN11:
-			return NetID::DWCAN11;
+			return _icsneo_netid_t::DWCAN11;
 		case CoreMini::DWCAN12:
-			return NetID::DWCAN12;
+			return _icsneo_netid_t::DWCAN12;
 		case CoreMini::DWCAN13:
-			return NetID::DWCAN13;
+			return _icsneo_netid_t::DWCAN13;
 		case CoreMini::DWCAN14:
-			return NetID::DWCAN14;
+			return _icsneo_netid_t::DWCAN14;
 		case CoreMini::DWCAN15:
-			return NetID::DWCAN15;
+			return _icsneo_netid_t::DWCAN15;
 		case CoreMini::DWCAN16:
-			return NetID::DWCAN16;
+			return _icsneo_netid_t::DWCAN16;
 		case CoreMini::LIN7:
-			return NetID::LIN7;
+			return _icsneo_netid_t::LIN7;
 		case CoreMini::LIN8:
-			return NetID::LIN8;
+			return _icsneo_netid_t::LIN8;
 		case CoreMini::LIN9:
-			return NetID::LIN9;
+			return _icsneo_netid_t::LIN9;
 		case CoreMini::LIN10:
-			return NetID::LIN10;
+			return _icsneo_netid_t::LIN10;
 		case CoreMini::LIN11:
-			return NetID::LIN11;
+			return _icsneo_netid_t::LIN11;
 		case CoreMini::LIN12:
-			return NetID::LIN12;
+			return _icsneo_netid_t::LIN12;
 		case CoreMini::LIN13:
-			return NetID::LIN13;
+			return _icsneo_netid_t::LIN13;
 		case CoreMini::LIN14:
-			return NetID::LIN14;
+			return _icsneo_netid_t::LIN14;
 		case CoreMini::LIN15:
-			return NetID::LIN15;
+			return _icsneo_netid_t::LIN15;
 		case CoreMini::LIN16:
-			return NetID::LIN16;
+			return _icsneo_netid_t::LIN16;
 		case CoreMini::SPI1:
-			return NetID::SPI1;
+			return _icsneo_netid_t::SPI1;
 		case CoreMini::SPI2:
-			return NetID::SPI2;
+			return _icsneo_netid_t::SPI2;
 		case CoreMini::SPI3:
-			return NetID::SPI3;
+			return _icsneo_netid_t::SPI3;
 		case CoreMini::SPI4:
-			return NetID::SPI4;
+			return _icsneo_netid_t::SPI4;
 		case CoreMini::SPI5:
-			return NetID::SPI5;
+			return _icsneo_netid_t::SPI5;
 		case CoreMini::SPI6:
-			return NetID::SPI6;
+			return _icsneo_netid_t::SPI6;
 		case CoreMini::SPI7:
-			return NetID::SPI7;
+			return _icsneo_netid_t::SPI7;
 		case CoreMini::SPI8:
-			return NetID::SPI8;
+			return _icsneo_netid_t::SPI8;
 		case CoreMini::MDIO1:
-			return NetID::MDIO1;
+			return _icsneo_netid_t::MDIO1;
 		case CoreMini::MDIO2:
-			return NetID::MDIO2;
+			return _icsneo_netid_t::MDIO2;
 		case CoreMini::MDIO3:
-			return NetID::MDIO3;
+			return _icsneo_netid_t::MDIO3;
 		case CoreMini::MDIO4:
-			return NetID::MDIO4;
+			return _icsneo_netid_t::MDIO4;
 		case CoreMini::MDIO5:
-			return NetID::MDIO5;
+			return _icsneo_netid_t::MDIO5;
 		case CoreMini::MDIO6:
-			return NetID::MDIO6;
+			return _icsneo_netid_t::MDIO6;
 		case CoreMini::MDIO7:
-			return NetID::MDIO7;
+			return _icsneo_netid_t::MDIO7;
 		case CoreMini::MDIO8:
-			return NetID::MDIO8;
+			return _icsneo_netid_t::MDIO8;
 
 		}
-		return NetID::Invalid; // Should be unreachable, the compiler should warn about new CoreMini IDs
+		return _icsneo_netid_t::Invalid; // Should be unreachable, the compiler should warn about new CoreMini IDs
 	}
 
-	Network() { setValue(NetID::Invalid); }
-	Network(neonetid_t netid, bool expand = true) { setValue(static_cast<NetID>(netid), expand); }
-	Network(NetID netid) { setValue(netid); }
+	Network() { setValue(_icsneo_netid_t::Invalid); }
+	Network(icsneo_netid_t netid, bool expand = true) { setValue(static_cast<_icsneo_netid_t>(netid), expand); }
+	Network(_icsneo_netid_t netid) { setValue(netid); }
 	Network(CoreMini cm) { setValue(GetNetIDFromCoreMiniNetwork(cm)); }
-	NetID getNetID() const { return value; }
+	_icsneo_netid_t getNetID() const { return value; }
 	icsneo_msg_bus_type_t getType() const { return type; }
 	VnetId getVnetId() const { return vnetId; }
 	std::optional<CoreMini> getCoreMini() const { return GetCoreMiniNetworkFromNetID(getNetID()); }
@@ -1379,16 +1379,16 @@ public:
 	friend bool operator!=(const Network& net1, const Network& net2) { return !(net1 == net2); }
 
 private:
-	NetID value; // Always use setValue so that value and type stay in sync
+	_icsneo_netid_t value; // Always use setValue so that value and type stay in sync
 	icsneo_msg_bus_type_t type;
-	NetID commonNetId;
+	_icsneo_netid_t commonNetId;
 	VnetId vnetId;
-	void setValue(NetID id, bool expand = true) {
+	void setValue(_icsneo_netid_t id, bool expand = true) {
 		value = id;
 		// Constructor can optionally suppress the expansion of of the ID into a VNET slot and common ID. The communication decoder and packetizer require this for device responses.
 		type = GetTypeOfNetID(value, expand);
 		if(expand) {
-			std::tie(vnetId, commonNetId) = GetVnetAgnosticNetid((neonetid_t)id);
+			std::tie(vnetId, commonNetId) = GetVnetAgnosticNetid((icsneo_netid_t)id);
 		} else {
 			// Caller wanted to suppress VNET ID decoding.
 			vnetId = VnetId::None;
diff --git a/include/icsneo/device/device.h b/include/icsneo/device/device.h
index c0ef39a..b81ad25 100644
--- a/include/icsneo/device/device.h
+++ b/include/icsneo/device/device.h
@@ -728,11 +728,11 @@ public:
 
 	virtual bool supportsTC10() const { return false; }
 
-	bool requestTC10Wake(Network::NetID network);
+	bool requestTC10Wake(Network::_icsneo_netid_t network);
 
-	bool requestTC10Sleep(Network::NetID network);
+	bool requestTC10Sleep(Network::_icsneo_netid_t network);
 
-	std::optional<TC10StatusMessage> getTC10Status(Network::NetID network);
+	std::optional<TC10StatusMessage> getTC10Status(Network::_icsneo_netid_t network);
 
 protected:
 	bool online = false;
diff --git a/include/icsneo/device/tree/etherbadge/etherbadge.h b/include/icsneo/device/tree/etherbadge/etherbadge.h
index 81a5b2a..de22c76 100644
--- a/include/icsneo/device/tree/etherbadge/etherbadge.h
+++ b/include/icsneo/device/tree/etherbadge/etherbadge.h
@@ -19,9 +19,9 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::LIN,
-			Network::NetID::OP_Ethernet1
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/etherbadge/etherbadgesettings.h b/include/icsneo/device/tree/etherbadge/etherbadgesettings.h
index 1a85ab0..adf8fe5 100644
--- a/include/icsneo/device/tree/etherbadge/etherbadgesettings.h
+++ b/include/icsneo/device/tree/etherbadge/etherbadgesettings.h
@@ -71,7 +71,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
 			default:
 				return nullptr;
@@ -82,7 +82,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
 			default:
 				return nullptr;
@@ -93,7 +93,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h
index de0ae2d..b31ed1c 100644
--- a/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h
+++ b/include/icsneo/device/tree/neoobd2pro/neoobd2pro.h
@@ -16,8 +16,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h b/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h
index f6bdffb..954b08b 100644
--- a/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h
+++ b/include/icsneo/device/tree/neoobd2sim/neoobd2sim.h
@@ -16,8 +16,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neoviconnect/neoviconnect.h b/include/icsneo/device/tree/neoviconnect/neoviconnect.h
index 926a9c6..d76b879 100644
--- a/include/icsneo/device/tree/neoviconnect/neoviconnect.h
+++ b/include/icsneo/device/tree/neoviconnect/neoviconnect.h
@@ -17,19 +17,19 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h b/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h
index 0c3e537..14c5b5c 100644
--- a/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h
+++ b/include/icsneo/device/tree/neoviconnect/neoviconnectsettings.h
@@ -94,21 +94,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can7);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -119,21 +119,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd7);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -144,9 +144,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
             default:
                 return nullptr;
diff --git a/include/icsneo/device/tree/neovifire/neovifire.h b/include/icsneo/device/tree/neovifire/neovifire.h
index 54e75c0..8663efa 100644
--- a/include/icsneo/device/tree/neovifire/neovifire.h
+++ b/include/icsneo/device/tree/neovifire/neovifire.h
@@ -16,19 +16,19 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
 
-			Network::NetID::LSFTCAN,
+			Network::_icsneo_netid_t::icsneo_netid_lsftcan,
 
-			Network::NetID::SWCAN,
+			Network::_icsneo_netid_t::icsneo_netid_swcan,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2,
-			Network::NetID::LIN3,
-			Network::NetID::LIN4
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2,
+			Network::_icsneo_netid_t::LIN3,
+			Network::_icsneo_netid_t::LIN4
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neovifire/neovifiresettings.h b/include/icsneo/device/tree/neovifire/neovifiresettings.h
index a7892f5..55c8085 100644
--- a/include/icsneo/device/tree/neovifire/neovifiresettings.h
+++ b/include/icsneo/device/tree/neovifire/neovifiresettings.h
@@ -105,15 +105,15 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::LSFTCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
 				return &(cfg->lsftcan);
 			default:
 				return nullptr;
@@ -125,7 +125,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::SWCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_swcan:
 				return &(cfg->swcan);
 			default:
 				return nullptr;
@@ -136,13 +136,13 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
-			case Network::NetID::LIN3:
+			case Network::_icsneo_netid_t::LIN3:
 				return &(cfg->lin3);
-			case Network::NetID::LIN4:
+			case Network::_icsneo_netid_t::LIN4:
 				return &(cfg->lin4);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/neovifire2/neovifire2.h b/include/icsneo/device/tree/neovifire2/neovifire2.h
index e202fe2..9897934 100644
--- a/include/icsneo/device/tree/neovifire2/neovifire2.h
+++ b/include/icsneo/device/tree/neovifire2/neovifire2.h
@@ -23,32 +23,32 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::LSFTCAN,
-			Network::NetID::LSFTCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_lsftcan,
+			Network::_icsneo_netid_t::LSFTCAN2,
 
-			Network::NetID::SWCAN,
-			Network::NetID::SWCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_swcan,
+			Network::_icsneo_netid_t::SWCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2,
-			Network::NetID::LIN3,
-			Network::NetID::LIN4,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2,
+			Network::_icsneo_netid_t::LIN3,
+			Network::_icsneo_netid_t::LIN4,
 
-			Network::NetID::ISO9141,
-			Network::NetID::ISO9141_2,
-			Network::NetID::ISO9141_3,
-			Network::NetID::ISO9141_4
+			Network::_icsneo_netid_t::icsneo_netid_iso9141,
+			Network::_icsneo_netid_t::icsneo_netid_iso9141_2,
+			Network::_icsneo_netid_t::ISO9141_3,
+			Network::_icsneo_netid_t::ISO9141_4
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neovifire2/neovifire2settings.h b/include/icsneo/device/tree/neovifire2/neovifire2settings.h
index c1c0222..a36a93c 100644
--- a/include/icsneo/device/tree/neovifire2/neovifire2settings.h
+++ b/include/icsneo/device/tree/neovifire2/neovifire2settings.h
@@ -128,25 +128,25 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can8);
-			case Network::NetID::LSFTCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
 				return &(cfg->lsftcan1);
-			case Network::NetID::LSFTCAN2:
+			case Network::_icsneo_netid_t::LSFTCAN2:
 				return &(cfg->lsftcan2);
 			default:
 				return nullptr;
@@ -157,21 +157,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -183,9 +183,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::SWCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_swcan:
 				return &(cfg->swcan1);
-			case Network::NetID::SWCAN2:
+			case Network::_icsneo_netid_t::SWCAN2:
 				return &(cfg->swcan2);
 			default:
 				return nullptr;
@@ -195,16 +195,16 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN5),
-				Network(Network::NetID::HSCAN7)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN5),
+				Network(Network::_icsneo_netid_t::HSCAN7)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4),
-				Network(Network::NetID::HSCAN6)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4),
+				Network(Network::_icsneo_netid_t::HSCAN6)
 			}
 		};
 	}
@@ -214,17 +214,17 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
-			case Network::NetID::LIN3:
+			case Network::_icsneo_netid_t::LIN3:
 				return &(cfg->lin3);
-			case Network::NetID::LIN4:
+			case Network::_icsneo_netid_t::LIN4:
 				return &(cfg->lin4);
-			case Network::NetID::LIN5:
+			case Network::_icsneo_netid_t::LIN5:
 				return &(cfg->lin5);
-			case Network::NetID::LIN6:
+			case Network::_icsneo_netid_t::LIN6:
 				return &(cfg->lin6);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/neovifire3/neovifire3.h b/include/icsneo/device/tree/neovifire3/neovifire3.h
index d6f8108..073a7af 100644
--- a/include/icsneo/device/tree/neovifire3/neovifire3.h
+++ b/include/icsneo/device/tree/neovifire3/neovifire3.h
@@ -17,35 +17,35 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
-			Network::NetID::DWCAN9,
-			Network::NetID::DWCAN10,
-			Network::NetID::DWCAN11,
-			Network::NetID::DWCAN12,
-			Network::NetID::DWCAN13,
-			Network::NetID::DWCAN14,
-			Network::NetID::DWCAN15,
-			Network::NetID::DWCAN16,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
+			Network::_icsneo_netid_t::DWCAN9,
+			Network::_icsneo_netid_t::DWCAN10,
+			Network::_icsneo_netid_t::DWCAN11,
+			Network::_icsneo_netid_t::DWCAN12,
+			Network::_icsneo_netid_t::DWCAN13,
+			Network::_icsneo_netid_t::DWCAN14,
+			Network::_icsneo_netid_t::DWCAN15,
+			Network::_icsneo_netid_t::DWCAN16,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
-			Network::NetID::Ethernet3,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet3,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2,
-			Network::NetID::LIN3,
-			Network::NetID::LIN4,
-			Network::NetID::LIN5,
-			Network::NetID::LIN6,
-			Network::NetID::LIN7,
-			Network::NetID::LIN8,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2,
+			Network::_icsneo_netid_t::LIN3,
+			Network::_icsneo_netid_t::LIN4,
+			Network::_icsneo_netid_t::LIN5,
+			Network::_icsneo_netid_t::LIN6,
+			Network::_icsneo_netid_t::LIN7,
+			Network::_icsneo_netid_t::LIN8,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neovifire3/neovifire3settings.h b/include/icsneo/device/tree/neovifire3/neovifire3settings.h
index 5dcbbb4..324babf 100644
--- a/include/icsneo/device/tree/neovifire3/neovifire3settings.h
+++ b/include/icsneo/device/tree/neovifire3/neovifire3settings.h
@@ -166,21 +166,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -191,21 +191,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -215,16 +215,16 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN5),
-				Network(Network::NetID::HSCAN7)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN5),
+				Network(Network::_icsneo_netid_t::HSCAN7)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4),
-				Network(Network::NetID::HSCAN6)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4),
+				Network(Network::_icsneo_netid_t::HSCAN6)
 			}
 		};
 	}
@@ -234,21 +234,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
-			case Network::NetID::LIN3:
+			case Network::_icsneo_netid_t::LIN3:
 				return &(cfg->lin3);
-			case Network::NetID::LIN4:
+			case Network::_icsneo_netid_t::LIN4:
 				return &(cfg->lin4);
-			case Network::NetID::LIN5:
+			case Network::_icsneo_netid_t::LIN5:
 				return &(cfg->lin5);
-			case Network::NetID::LIN6:
+			case Network::_icsneo_netid_t::LIN6:
 				return &(cfg->lin6);
-			case Network::NetID::LIN7:
+			case Network::_icsneo_netid_t::LIN7:
 				return &(cfg->lin7);
-			case Network::NetID::LIN8:
+			case Network::_icsneo_netid_t::LIN8:
 				return &(cfg->lin8);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h
index 944fcaf..157e569 100644
--- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h
+++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexray.h
@@ -17,37 +17,37 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
-			Network::NetID::DWCAN9,
-			Network::NetID::DWCAN10,
-			Network::NetID::DWCAN11,
-			Network::NetID::DWCAN12,
-			Network::NetID::DWCAN13,
-			Network::NetID::DWCAN14,
-			Network::NetID::DWCAN15,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
+			Network::_icsneo_netid_t::DWCAN9,
+			Network::_icsneo_netid_t::DWCAN10,
+			Network::_icsneo_netid_t::DWCAN11,
+			Network::_icsneo_netid_t::DWCAN12,
+			Network::_icsneo_netid_t::DWCAN13,
+			Network::_icsneo_netid_t::DWCAN14,
+			Network::_icsneo_netid_t::DWCAN15,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
-			Network::NetID::Ethernet3,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet3,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2,
-			Network::NetID::LIN3,
-			Network::NetID::LIN4,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2,
+			Network::_icsneo_netid_t::LIN3,
+			Network::_icsneo_netid_t::LIN4,
 
-			Network::NetID::FlexRay,
-			Network::NetID::FlexRay1a,
-			Network::NetID::FlexRay1b,
-			Network::NetID::FlexRay2,
-			Network::NetID::FlexRay2a,
-			Network::NetID::FlexRay2b,
+			Network::_icsneo_netid_t::FlexRay,
+			Network::_icsneo_netid_t::FlexRay1a,
+			Network::_icsneo_netid_t::FlexRay1b,
+			Network::_icsneo_netid_t::FlexRay2,
+			Network::_icsneo_netid_t::FlexRay2a,
+			Network::_icsneo_netid_t::FlexRay2b,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
index 26c7934..01ab50a 100644
--- a/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
+++ b/include/icsneo/device/tree/neovifire3flexray/neovifire3flexraysettings.h
@@ -149,21 +149,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -174,21 +174,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -198,16 +198,16 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN5),
-				Network(Network::NetID::HSCAN7)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN5),
+				Network(Network::_icsneo_netid_t::HSCAN7)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4),
-				Network(Network::NetID::HSCAN6)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4),
+				Network(Network::_icsneo_netid_t::HSCAN6)
 			}
 		};
 	}
@@ -217,13 +217,13 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
-			case Network::NetID::LIN3:
+			case Network::_icsneo_netid_t::LIN3:
 				return &(cfg->lin3);
-			case Network::NetID::LIN4:
+			case Network::_icsneo_netid_t::LIN4:
 				return &(cfg->lin4);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/neovired2/neovired2.h b/include/icsneo/device/tree/neovired2/neovired2.h
index 0abbf37..62309c7 100644
--- a/include/icsneo/device/tree/neovired2/neovired2.h
+++ b/include/icsneo/device/tree/neovired2/neovired2.h
@@ -17,20 +17,20 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/neovired2/neovired2settings.h b/include/icsneo/device/tree/neovired2/neovired2settings.h
index e462911..cddbb9f 100644
--- a/include/icsneo/device/tree/neovired2/neovired2settings.h
+++ b/include/icsneo/device/tree/neovired2/neovired2settings.h
@@ -107,21 +107,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can7);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -132,21 +132,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd7);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -156,16 +156,16 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN5),
-				Network(Network::NetID::HSCAN7)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN5),
+				Network(Network::_icsneo_netid_t::HSCAN7)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4),
-				Network(Network::NetID::HSCAN6)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4),
+				Network(Network::_icsneo_netid_t::HSCAN6)
 			}
 		};
 	}
@@ -175,9 +175,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/plasion/plasion.h b/include/icsneo/device/tree/plasion/plasion.h
index 4dbcf8f..0669308 100644
--- a/include/icsneo/device/tree/plasion/plasion.h
+++ b/include/icsneo/device/tree/plasion/plasion.h
@@ -13,29 +13,29 @@ class Plasion : public Device {
 public:
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::LSFTCAN,
-			Network::NetID::LSFTCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_lsftcan,
+			Network::_icsneo_netid_t::LSFTCAN2,
 
-			Network::NetID::SWCAN,
-			Network::NetID::SWCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_swcan,
+			Network::_icsneo_netid_t::SWCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN,
-			Network::NetID::LIN2,
-			Network::NetID::LIN3,
-			Network::NetID::LIN4,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::LIN2,
+			Network::_icsneo_netid_t::LIN3,
+			Network::_icsneo_netid_t::LIN4,
 
-			Network::NetID::FlexRay
+			Network::_icsneo_netid_t::FlexRay
 		};
 		return supportedNetworks;
 	}
@@ -51,8 +51,8 @@ protected:
 	virtual bool isSupportedTXNetwork(const Network&) const override { return true; }
 	virtual void setupExtensions() override {
 		std::vector<Network> flexRayControllers;
-		flexRayControllers.push_back(Network::NetID::FlexRay);
-		flexRayControllers.push_back(Network::NetID::FlexRay); // TODO Becomes FlexRay2 if not in coldstart mode
+		flexRayControllers.push_back(Network::_icsneo_netid_t::FlexRay);
+		flexRayControllers.push_back(Network::_icsneo_netid_t::FlexRay); // TODO Becomes FlexRay2 if not in coldstart mode
 		addExtension(std::make_shared<FlexRay::Extension>(*this, flexRayControllers));
 	}
 
diff --git a/include/icsneo/device/tree/rada2b/rada2b.h b/include/icsneo/device/tree/rada2b/rada2b.h
index 31ddc26..d8cecb4 100644
--- a/include/icsneo/device/tree/rada2b/rada2b.h
+++ b/include/icsneo/device/tree/rada2b/rada2b.h
@@ -21,20 +21,20 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::A2B1,
-			Network::NetID::A2B2,
+			Network::_icsneo_netid_t::A2B1,
+			Network::_icsneo_netid_t::A2B2,
 
-			Network::NetID::I2C,
-			Network::NetID::I2C2,
+			Network::_icsneo_netid_t::I2C,
+			Network::_icsneo_netid_t::I2C2,
 
-			Network::NetID::MDIO1,
+			Network::_icsneo_netid_t::MDIO1,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/rada2b/rada2bsettings.h b/include/icsneo/device/tree/rada2b/rada2bsettings.h
index 55466c7..f9a8d42 100644
--- a/include/icsneo/device/tree/rada2b/rada2bsettings.h
+++ b/include/icsneo/device/tree/rada2b/rada2bsettings.h
@@ -104,9 +104,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -117,9 +117,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -131,7 +131,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radcomet/radcomet2.h b/include/icsneo/device/tree/radcomet/radcomet2.h
index 4ba6f7e..1e33da0 100644
--- a/include/icsneo/device/tree/radcomet/radcomet2.h
+++ b/include/icsneo/device/tree/radcomet/radcomet2.h
@@ -22,8 +22,8 @@ public:
 
 	const std::vector<Network>& GetSupportedNetworks() override {
 		static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
-		supportedNetworks.push_back(Network::NetID::OP_Ethernet3);
-		supportedNetworks.push_back(Network::NetID::MDIO4);
+		supportedNetworks.push_back(Network::_icsneo_netid_t::icsneo_netid_op_ethernet3);
+		supportedNetworks.push_back(Network::_icsneo_netid_t::MDIO4);
 		return supportedNetworks;
 	}
 
diff --git a/include/icsneo/device/tree/radcomet/radcometbase.h b/include/icsneo/device/tree/radcomet/radcometbase.h
index 4c2c8b6..46d17e5 100644
--- a/include/icsneo/device/tree/radcomet/radcometbase.h
+++ b/include/icsneo/device/tree/radcomet/radcometbase.h
@@ -12,20 +12,20 @@ class RADCometBase : public Device {
 public:
 	virtual const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
 
-			Network::NetID::LIN,
-			Network::NetID::ISO9141,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::icsneo_netid_iso9141,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
-			Network::NetID::MDIO3,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
+			Network::_icsneo_netid_t::MDIO3,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radcomet/radcometsettings.h b/include/icsneo/device/tree/radcomet/radcometsettings.h
index f673603..03e4771 100644
--- a/include/icsneo/device/tree/radcomet/radcometsettings.h
+++ b/include/icsneo/device/tree/radcomet/radcometsettings.h
@@ -95,9 +95,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -108,9 +108,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radcomet3/radcomet3.h b/include/icsneo/device/tree/radcomet3/radcomet3.h
index f4adc08..62cd757 100644
--- a/include/icsneo/device/tree/radcomet3/radcomet3.h
+++ b/include/icsneo/device/tree/radcomet3/radcomet3.h
@@ -18,24 +18,24 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
-			Network::NetID::OP_Ethernet3,
-			Network::NetID::OP_Ethernet4,
-			Network::NetID::OP_Ethernet5,
-			Network::NetID::OP_Ethernet6,
-			Network::NetID::OP_Ethernet7,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
+			Network::_icsneo_netid_t::OP_Ethernet4,
+			Network::_icsneo_netid_t::OP_Ethernet5,
+			Network::_icsneo_netid_t::OP_Ethernet6,
+			Network::_icsneo_netid_t::OP_Ethernet7,
 
-			Network::NetID::LIN,
-			Network::NetID::ISO9141,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
+			Network::_icsneo_netid_t::icsneo_netid_iso9141,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radcomet3/radcomet3settings.h b/include/icsneo/device/tree/radcomet3/radcomet3settings.h
index 3476aac..1b70d5f 100644
--- a/include/icsneo/device/tree/radcomet3/radcomet3settings.h
+++ b/include/icsneo/device/tree/radcomet3/radcomet3settings.h
@@ -92,9 +92,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -105,9 +105,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radepsilon/radepsilon.h b/include/icsneo/device/tree/radepsilon/radepsilon.h
index 741f333..625a555 100644
--- a/include/icsneo/device/tree/radepsilon/radepsilon.h
+++ b/include/icsneo/device/tree/radepsilon/radepsilon.h
@@ -14,12 +14,12 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet, // Connected to port 6 on the switch
+			Network::_icsneo_netid_t::Ethernet, // Connected to port 6 on the switch
 
-			Network::NetID::LIN
+			Network::_icsneo_netid_t::icsneo_netid_lin
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxy.h b/include/icsneo/device/tree/radgalaxy/radgalaxy.h
index f916314..c36f944 100644
--- a/include/icsneo/device/tree/radgalaxy/radgalaxy.h
+++ b/include/icsneo/device/tree/radgalaxy/radgalaxy.h
@@ -21,41 +21,41 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::SWCAN,
-			Network::NetID::SWCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_swcan,
+			Network::_icsneo_netid_t::SWCAN2,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
 			
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
-			Network::NetID::OP_Ethernet3,
-			Network::NetID::OP_Ethernet4,
-			Network::NetID::OP_Ethernet5,
-			Network::NetID::OP_Ethernet6,
-			Network::NetID::OP_Ethernet7,
-			Network::NetID::OP_Ethernet8,
-			Network::NetID::OP_Ethernet9,
-			Network::NetID::OP_Ethernet10,
-			Network::NetID::OP_Ethernet11,
-			Network::NetID::OP_Ethernet12,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
+			Network::_icsneo_netid_t::OP_Ethernet4,
+			Network::_icsneo_netid_t::OP_Ethernet5,
+			Network::_icsneo_netid_t::OP_Ethernet6,
+			Network::_icsneo_netid_t::OP_Ethernet7,
+			Network::_icsneo_netid_t::OP_Ethernet8,
+			Network::_icsneo_netid_t::OP_Ethernet9,
+			Network::_icsneo_netid_t::OP_Ethernet10,
+			Network::_icsneo_netid_t::OP_Ethernet11,
+			Network::_icsneo_netid_t::OP_Ethernet12,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
-			Network::NetID::MDIO3,
-			Network::NetID::MDIO4,
-			Network::NetID::MDIO5,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
+			Network::_icsneo_netid_t::MDIO3,
+			Network::_icsneo_netid_t::MDIO4,
+			Network::_icsneo_netid_t::MDIO5,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h
index 317f388..79aa511 100644
--- a/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h
+++ b/include/icsneo/device/tree/radgalaxy/radgalaxysettings.h
@@ -112,21 +112,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -137,21 +137,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -162,9 +162,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::SWCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_swcan:
 				return &(cfg->swcan1);
-			case Network::NetID::SWCAN2:
+			case Network::_icsneo_netid_t::SWCAN2:
 				return &(cfg->swcan2);
 			default:
 				return nullptr;
@@ -176,7 +176,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radgigastar/radgigastar.h b/include/icsneo/device/tree/radgigastar/radgigastar.h
index 248d4d9..f231d1b 100644
--- a/include/icsneo/device/tree/radgigastar/radgigastar.h
+++ b/include/icsneo/device/tree/radgigastar/radgigastar.h
@@ -47,59 +47,59 @@ protected:
 
 	void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
 		static std::vector<Network> supportedRxNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
 
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::FlexRay1a,
-			Network::NetID::FlexRay1b,
+			Network::_icsneo_netid_t::FlexRay1a,
+			Network::_icsneo_netid_t::FlexRay1b,
 
-			Network::NetID::I2C,
-			Network::NetID::I2C2,
-			Network::NetID::I2C3,
+			Network::_icsneo_netid_t::I2C,
+			Network::_icsneo_netid_t::I2C2,
+			Network::_icsneo_netid_t::I2C3,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
 	}
 
 	void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override {
 		static std::vector<Network> supportedTxNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
 
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
 			// FlexRay is Receive Only
 
-			Network::NetID::I2C,
-			Network::NetID::I2C2,
-			Network::NetID::I2C3,
+			Network::_icsneo_netid_t::I2C,
+			Network::_icsneo_netid_t::I2C2,
+			Network::_icsneo_netid_t::I2C3,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
 	}
diff --git a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h
index d5180d7..3a21772 100644
--- a/include/icsneo/device/tree/radgigastar/radgigastarsettings.h
+++ b/include/icsneo/device/tree/radgigastar/radgigastarsettings.h
@@ -101,17 +101,17 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
 			default:
 				return nullptr;
@@ -122,17 +122,17 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
 			default:
 				return nullptr;
@@ -142,14 +142,14 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN4)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN4)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN5)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN5)
 			}
 		};
 	}
@@ -159,7 +159,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2.h b/include/icsneo/device/tree/radgigastar2/radgigastar2.h
index 740d528..e467f12 100644
--- a/include/icsneo/device/tree/radgigastar2/radgigastar2.h
+++ b/include/icsneo/device/tree/radgigastar2/radgigastar2.h
@@ -23,50 +23,50 @@ namespace icsneo
 		static const std::vector<Network> &GetSupportedNetworks()
 		{
 			static std::vector<Network> supportedNetworks = {
-				Network::NetID::HSCAN,
-				Network::NetID::HSCAN2,
-				Network::NetID::HSCAN3,
-				Network::NetID::HSCAN4,
+				Network::_icsneo_netid_t::icsneo_netid_hscan,
+				Network::_icsneo_netid_t::HSCAN2,
+				Network::_icsneo_netid_t::HSCAN3,
+				Network::_icsneo_netid_t::HSCAN4,
 
-				Network::NetID::Ethernet,
-				Network::NetID::Ethernet2,
+				Network::_icsneo_netid_t::Ethernet,
+				Network::_icsneo_netid_t::Ethernet2,
 
-				Network::NetID::OP_Ethernet1,
-				Network::NetID::OP_Ethernet2,
-				Network::NetID::OP_Ethernet3,
-				Network::NetID::OP_Ethernet4,
-				Network::NetID::OP_Ethernet5,
-				Network::NetID::OP_Ethernet6,
-				Network::NetID::OP_Ethernet7,
-				Network::NetID::OP_Ethernet8,
-				Network::NetID::OP_Ethernet9,
-				Network::NetID::OP_Ethernet10,
+				Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+				Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
+				Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
+				Network::_icsneo_netid_t::OP_Ethernet4,
+				Network::_icsneo_netid_t::OP_Ethernet5,
+				Network::_icsneo_netid_t::OP_Ethernet6,
+				Network::_icsneo_netid_t::OP_Ethernet7,
+				Network::_icsneo_netid_t::OP_Ethernet8,
+				Network::_icsneo_netid_t::OP_Ethernet9,
+				Network::_icsneo_netid_t::OP_Ethernet10,
 
-				Network::NetID::LIN,
-				Network::NetID::LIN2,
-				Network::NetID::LIN3,
-				Network::NetID::LIN4,
-				Network::NetID::LIN5,
-				Network::NetID::LIN6,
-				Network::NetID::LIN7,
-				Network::NetID::LIN8,
-				Network::NetID::LIN9,
-				Network::NetID::LIN10,
+				Network::_icsneo_netid_t::icsneo_netid_lin,
+				Network::_icsneo_netid_t::LIN2,
+				Network::_icsneo_netid_t::LIN3,
+				Network::_icsneo_netid_t::LIN4,
+				Network::_icsneo_netid_t::LIN5,
+				Network::_icsneo_netid_t::LIN6,
+				Network::_icsneo_netid_t::LIN7,
+				Network::_icsneo_netid_t::LIN8,
+				Network::_icsneo_netid_t::LIN9,
+				Network::_icsneo_netid_t::LIN10,
 
-				Network::NetID::I2C,
-				Network::NetID::I2C2,
+				Network::_icsneo_netid_t::I2C,
+				Network::_icsneo_netid_t::I2C2,
 
-				Network::NetID::MDIO1,
-				Network::NetID::MDIO2,
+				Network::_icsneo_netid_t::MDIO1,
+				Network::_icsneo_netid_t::MDIO2,
 
-				Network::NetID::SPI1,
-				Network::NetID::SPI2,
-				Network::NetID::SPI3,
-				Network::NetID::SPI4,
-				Network::NetID::SPI5,
-				Network::NetID::SPI6,
-				Network::NetID::SPI7,
-				Network::NetID::SPI8,
+				Network::_icsneo_netid_t::SPI1,
+				Network::_icsneo_netid_t::SPI2,
+				Network::_icsneo_netid_t::SPI3,
+				Network::_icsneo_netid_t::SPI4,
+				Network::_icsneo_netid_t::SPI5,
+				Network::_icsneo_netid_t::SPI6,
+				Network::_icsneo_netid_t::SPI7,
+				Network::_icsneo_netid_t::SPI8,
 			};
 			return supportedNetworks;
 		}
diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h
index db31512..9583b73 100644
--- a/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h
+++ b/include/icsneo/device/tree/radgigastar2/radgigastar2settings.h
@@ -147,13 +147,13 @@ namespace icsneo
 				return nullptr;
 			switch (net.getNetID())
 			{
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can4);
 			default:
 				return nullptr;
@@ -166,13 +166,13 @@ namespace icsneo
 				return nullptr;
 			switch (net.getNetID())
 			{
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd4);
 			default:
 				return nullptr;
@@ -182,10 +182,10 @@ namespace icsneo
 		virtual std::vector<TerminationGroup> getTerminationGroups() const override
 		{
 			return {
-				{Network(Network::NetID::HSCAN)},
-				{Network(Network::NetID::HSCAN2)},
-				{Network(Network::NetID::HSCAN3)},
-				{Network(Network::NetID::HSCAN4)}};
+				{Network(Network::_icsneo_netid_t::icsneo_netid_hscan)},
+				{Network(Network::_icsneo_netid_t::HSCAN2)},
+				{Network(Network::_icsneo_netid_t::HSCAN3)},
+				{Network(Network::_icsneo_netid_t::HSCAN4)}};
 		}
 
 		const LIN_SETTINGS *getLINSettingsFor(Network net) const override
@@ -195,25 +195,25 @@ namespace icsneo
 				return nullptr;
 			switch (net.getNetID())
 			{
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
-			case Network::NetID::LIN2:
+			case Network::_icsneo_netid_t::LIN2:
 				return &(cfg->lin2);
-			case Network::NetID::LIN3:
+			case Network::_icsneo_netid_t::LIN3:
 				return &(cfg->lin3);
-			case Network::NetID::LIN4:
+			case Network::_icsneo_netid_t::LIN4:
 				return &(cfg->lin4);
-			case Network::NetID::LIN5:
+			case Network::_icsneo_netid_t::LIN5:
 				return &(cfg->lin5);
-			case Network::NetID::LIN6:
+			case Network::_icsneo_netid_t::LIN6:
 				return &(cfg->lin6);
-			case Network::NetID::LIN7:
+			case Network::_icsneo_netid_t::LIN7:
 				return &(cfg->lin7);
-			case Network::NetID::LIN8:
+			case Network::_icsneo_netid_t::LIN8:
 				return &(cfg->lin8);
-			case Network::NetID::LIN9:
+			case Network::_icsneo_netid_t::LIN9:
 				return &(cfg->lin9);
-			case Network::NetID::LIN10:
+			case Network::_icsneo_netid_t::LIN10:
 				return &(cfg->lin10);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radjupiter/radjupiter.h b/include/icsneo/device/tree/radjupiter/radjupiter.h
index 9447c82..83ca79b 100644
--- a/include/icsneo/device/tree/radjupiter/radjupiter.h
+++ b/include/icsneo/device/tree/radjupiter/radjupiter.h
@@ -17,12 +17,12 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::Ethernet // Connected to port 6 on the switch
+			Network::_icsneo_netid_t::Ethernet // Connected to port 6 on the switch
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radjupiter/radjupitersettings.h b/include/icsneo/device/tree/radjupiter/radjupitersettings.h
index 6bea9c0..a71427e 100644
--- a/include/icsneo/device/tree/radjupiter/radjupitersettings.h
+++ b/include/icsneo/device/tree/radjupiter/radjupitersettings.h
@@ -97,9 +97,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -110,9 +110,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -123,7 +123,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radmars/radmars.h b/include/icsneo/device/tree/radmars/radmars.h
index e112082..200d9a5 100644
--- a/include/icsneo/device/tree/radmars/radmars.h
+++ b/include/icsneo/device/tree/radmars/radmars.h
@@ -43,55 +43,55 @@ protected:
 
 	void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
 		static std::vector<Network> supportedRxNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
-			Network::NetID::Ethernet3,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet3,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::FlexRay1a,
-			Network::NetID::FlexRay1b,
+			Network::_icsneo_netid_t::FlexRay1a,
+			Network::_icsneo_netid_t::FlexRay1b,
 
-			Network::NetID::I2C,
+			Network::_icsneo_netid_t::I2C,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
 	}
 
 	void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override {
 		static std::vector<Network> supportedTxNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4,
-			Network::NetID::HSCAN5,
-			Network::NetID::HSCAN6,
-			Network::NetID::HSCAN7,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4,
+			Network::_icsneo_netid_t::HSCAN5,
+			Network::_icsneo_netid_t::HSCAN6,
+			Network::_icsneo_netid_t::HSCAN7,
 
-			Network::NetID::Ethernet,
-			Network::NetID::Ethernet2,
-			Network::NetID::Ethernet3,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::Ethernet2,
+			Network::_icsneo_netid_t::Ethernet3,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
 			// FlexRay is Receive Only
 			
-			Network::NetID::I2C,
+			Network::_icsneo_netid_t::I2C,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
 	}
diff --git a/include/icsneo/device/tree/radmars/radmarssettings.h b/include/icsneo/device/tree/radmars/radmarssettings.h
index 1d4a836..8bddd7a 100644
--- a/include/icsneo/device/tree/radmars/radmarssettings.h
+++ b/include/icsneo/device/tree/radmars/radmarssettings.h
@@ -107,21 +107,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->can6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->can7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->can8);
 			default:
 				return nullptr;
@@ -132,21 +132,21 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd4);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd5);
-			case Network::NetID::HSCAN5:
+			case Network::_icsneo_netid_t::HSCAN5:
 				return &(cfg->canfd6);
-			case Network::NetID::HSCAN6:
+			case Network::_icsneo_netid_t::HSCAN6:
 				return &(cfg->canfd7);
-			case Network::NetID::HSCAN7:
+			case Network::_icsneo_netid_t::HSCAN7:
 				return &(cfg->canfd8);
 			default:
 				return nullptr;
@@ -156,16 +156,16 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3),
-				Network(Network::NetID::HSCAN5),
-				Network(Network::NetID::HSCAN7)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3),
+				Network(Network::_icsneo_netid_t::HSCAN5),
+				Network(Network::_icsneo_netid_t::HSCAN7)
 			},
 			{
-				Network(Network::NetID::MSCAN),
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4),
-				Network(Network::NetID::HSCAN6)
+				Network(Network::_icsneo_netid_t::icsneo_netid_mscan),
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4),
+				Network(Network::_icsneo_netid_t::HSCAN6)
 			}
 		};
 	}
@@ -175,7 +175,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radmoon2/radmoon2base.h b/include/icsneo/device/tree/radmoon2/radmoon2base.h
index a7f8764..8cd0cd5 100644
--- a/include/icsneo/device/tree/radmoon2/radmoon2base.h
+++ b/include/icsneo/device/tree/radmoon2/radmoon2base.h
@@ -18,8 +18,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radmoon3/radmoon3.h b/include/icsneo/device/tree/radmoon3/radmoon3.h
index 7874fcf..c74157a 100644
--- a/include/icsneo/device/tree/radmoon3/radmoon3.h
+++ b/include/icsneo/device/tree/radmoon3/radmoon3.h
@@ -17,8 +17,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::Ethernet,
-			Network::NetID::OP_Ethernet1,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radmoonduo/radmoonduo.h b/include/icsneo/device/tree/radmoonduo/radmoonduo.h
index b10bb82..26925b9 100644
--- a/include/icsneo/device/tree/radmoonduo/radmoonduo.h
+++ b/include/icsneo/device/tree/radmoonduo/radmoonduo.h
@@ -18,7 +18,7 @@ public:
 	static const std::vector<Network>& GetSupportedNetworks() {
 		// If Converter1 Target is set to USB/CM, OP_Ethernet2 will be exposed to the PC
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::OP_Ethernet2
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radmoont1s/radmoont1s.h b/include/icsneo/device/tree/radmoont1s/radmoont1s.h
index 8c02847..b9431eb 100644
--- a/include/icsneo/device/tree/radmoont1s/radmoont1s.h
+++ b/include/icsneo/device/tree/radmoont1s/radmoont1s.h
@@ -18,13 +18,13 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::OP_Ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
 
-			Network::NetID::MDIO1,
+			Network::_icsneo_netid_t::MDIO1,
 
-			Network::NetID::SPI1,
+			Network::_icsneo_netid_t::SPI1,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radpluto/radpluto.h b/include/icsneo/device/tree/radpluto/radpluto.h
index b9c6169..56b2948 100644
--- a/include/icsneo/device/tree/radpluto/radpluto.h
+++ b/include/icsneo/device/tree/radpluto/radpluto.h
@@ -17,17 +17,17 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::LIN,
+			Network::_icsneo_netid_t::icsneo_netid_lin,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 			
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
-			Network::NetID::OP_Ethernet3,
-			Network::NetID::OP_Ethernet4
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet3,
+			Network::_icsneo_netid_t::OP_Ethernet4
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radpluto/radplutosettings.h b/include/icsneo/device/tree/radpluto/radplutosettings.h
index 1a81ab2..cec79b8 100644
--- a/include/icsneo/device/tree/radpluto/radplutosettings.h
+++ b/include/icsneo/device/tree/radpluto/radplutosettings.h
@@ -83,9 +83,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -96,9 +96,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -110,7 +110,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radstar2/radstar2.h b/include/icsneo/device/tree/radstar2/radstar2.h
index 2b04ed8..84a6923 100644
--- a/include/icsneo/device/tree/radstar2/radstar2.h
+++ b/include/icsneo/device/tree/radstar2/radstar2.h
@@ -18,16 +18,16 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::OP_Ethernet2,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet2,
 
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/radstar2/radstar2settings.h b/include/icsneo/device/tree/radstar2/radstar2settings.h
index 5c77be4..b2d3c0b 100644
--- a/include/icsneo/device/tree/radstar2/radstar2settings.h
+++ b/include/icsneo/device/tree/radstar2/radstar2settings.h
@@ -78,9 +78,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -91,9 +91,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -105,7 +105,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/radsupermoon/radsupermoon.h b/include/icsneo/device/tree/radsupermoon/radsupermoon.h
index c269555..374b079 100644
--- a/include/icsneo/device/tree/radsupermoon/radsupermoon.h
+++ b/include/icsneo/device/tree/radsupermoon/radsupermoon.h
@@ -22,10 +22,10 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::Ethernet,
-			Network::NetID::OP_Ethernet1,
-			Network::NetID::MDIO1,
-			Network::NetID::MDIO2,
+			Network::_icsneo_netid_t::Ethernet,
+			Network::_icsneo_netid_t::icsneo_netid_op_ethernet1,
+			Network::_icsneo_netid_t::MDIO1,
+			Network::_icsneo_netid_t::MDIO2,
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan3/valuecan3.h b/include/icsneo/device/tree/valuecan3/valuecan3.h
index e16990a..5f93688 100644
--- a/include/icsneo/device/tree/valuecan3/valuecan3.h
+++ b/include/icsneo/device/tree/valuecan3/valuecan3.h
@@ -16,8 +16,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::MSCAN
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::icsneo_netid_mscan
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan3/valuecan3settings.h b/include/icsneo/device/tree/valuecan3/valuecan3settings.h
index 04a4089..8f2e794 100644
--- a/include/icsneo/device/tree/valuecan3/valuecan3settings.h
+++ b/include/icsneo/device/tree/valuecan3/valuecan3settings.h
@@ -41,9 +41,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::MSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_mscan:
 				return &(cfg->can2);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h
index c062b67..915e118 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h
@@ -15,7 +15,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
index a06b08c..38b2598 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
@@ -16,9 +16,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -29,9 +29,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -40,8 +40,8 @@ public:
 
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
-			{ Network(Network::NetID::HSCAN) },
-			{ Network(Network::NetID::HSCAN2) }
+			{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
+			{ Network(Network::_icsneo_netid_t::HSCAN2) }
 		};
 	}
 
@@ -50,7 +50,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
index 6b978fa..00294b8 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
@@ -15,9 +15,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -28,9 +28,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -39,8 +39,8 @@ public:
 
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
-			{ Network(Network::NetID::HSCAN) },
-			{ Network(Network::NetID::HSCAN2) }
+			{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
+			{ Network(Network::_icsneo_netid_t::HSCAN2) }
 		};
 	}
 
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h
index 2a8ed79..d83b143 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h
@@ -16,9 +16,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -29,9 +29,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -43,7 +43,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
index dabf533..5099f9b 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
@@ -16,13 +16,13 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->can3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->can4);
 			default:
 				return nullptr;
@@ -33,13 +33,13 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
-			case Network::NetID::HSCAN3:
+			case Network::_icsneo_netid_t::HSCAN3:
 				return &(cfg->canfd3);
-			case Network::NetID::HSCAN4:
+			case Network::_icsneo_netid_t::HSCAN4:
 				return &(cfg->canfd4);
 			default:
 				return nullptr;
@@ -49,12 +49,12 @@ public:
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
 			{
-				Network(Network::NetID::HSCAN),
-				Network(Network::NetID::HSCAN3)
+				Network(Network::_icsneo_netid_t::icsneo_netid_hscan),
+				Network(Network::_icsneo_netid_t::HSCAN3)
 			},
 			{
-				Network(Network::NetID::HSCAN2),
-				Network(Network::NetID::HSCAN4)
+				Network(Network::_icsneo_netid_t::HSCAN2),
+				Network(Network::_icsneo_netid_t::HSCAN4)
 			}
 		};
 	}
@@ -64,7 +64,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LIN:
+			case Network::_icsneo_netid_t::icsneo_netid_lin:
 				return &(cfg->lin1);
 			default:
 				return nullptr;
diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
index 343b3d9..36c0fc8 100644
--- a/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
+++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
@@ -16,9 +16,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->can2);
 			default:
 				return nullptr;
@@ -29,9 +29,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->canfd1);
-			case Network::NetID::HSCAN2:
+			case Network::_icsneo_netid_t::HSCAN2:
 				return &(cfg->canfd2);
 			default:
 				return nullptr;
@@ -40,8 +40,8 @@ public:
 
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
-			{ Network(Network::NetID::HSCAN) },
-			{ Network(Network::NetID::HSCAN2) }
+			{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) },
+			{ Network(Network::_icsneo_netid_t::HSCAN2) }
 		};
 	}
 
diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-1.h b/include/icsneo/device/tree/valuecan4/valuecan4-1.h
index 955b2b4..93e9025 100644
--- a/include/icsneo/device/tree/valuecan4/valuecan4-1.h
+++ b/include/icsneo/device/tree/valuecan4/valuecan4-1.h
@@ -16,7 +16,7 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN
+			Network::_icsneo_netid_t::icsneo_netid_hscan
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2.h b/include/icsneo/device/tree/valuecan4/valuecan4-2.h
index 68cfd99..ec202ee 100644
--- a/include/icsneo/device/tree/valuecan4/valuecan4-2.h
+++ b/include/icsneo/device/tree/valuecan4/valuecan4-2.h
@@ -21,8 +21,8 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h
index aa310df..de57cda 100644
--- a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h
+++ b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h
@@ -50,12 +50,12 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN
+			Network::_icsneo_netid_t::icsneo_netid_lin
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-4.h b/include/icsneo/device/tree/valuecan4/valuecan4-4.h
index 7292311..3f972e5 100644
--- a/include/icsneo/device/tree/valuecan4/valuecan4-4.h
+++ b/include/icsneo/device/tree/valuecan4/valuecan4-4.h
@@ -23,10 +23,10 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
-			Network::NetID::HSCAN3,
-			Network::NetID::HSCAN4
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
+			Network::_icsneo_netid_t::HSCAN3,
+			Network::_icsneo_netid_t::HSCAN4
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/valuecan4/valuecan4industrial.h b/include/icsneo/device/tree/valuecan4/valuecan4industrial.h
index c99587f..5952e70 100644
--- a/include/icsneo/device/tree/valuecan4/valuecan4industrial.h
+++ b/include/icsneo/device/tree/valuecan4/valuecan4industrial.h
@@ -17,12 +17,12 @@ public:
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
-			Network::NetID::HSCAN,
-			Network::NetID::HSCAN2,
+			Network::_icsneo_netid_t::icsneo_netid_hscan,
+			Network::_icsneo_netid_t::HSCAN2,
 
-			Network::NetID::Ethernet,
+			Network::_icsneo_netid_t::Ethernet,
 
-			Network::NetID::LIN
+			Network::_icsneo_netid_t::icsneo_netid_lin
 		};
 		return supportedNetworks;
 	}
diff --git a/include/icsneo/device/tree/vividcan/vividcansettings.h b/include/icsneo/device/tree/vividcan/vividcansettings.h
index c2b0c79..1172388 100644
--- a/include/icsneo/device/tree/vividcan/vividcansettings.h
+++ b/include/icsneo/device/tree/vividcan/vividcansettings.h
@@ -52,9 +52,9 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::HSCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_hscan:
 				return &(cfg->can1);
-			case Network::NetID::LSFTCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
 				return &(cfg->lsftcan1);
 			default:
 				return nullptr;
@@ -65,7 +65,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::LSFTCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_lsftcan:
 				return &(cfg->lsftcan1);
 			default:
 				return nullptr;
@@ -76,7 +76,7 @@ public:
 		if(cfg == nullptr)
 			return nullptr;
 		switch(net.getNetID()) {
-			case Network::NetID::SWCAN:
+			case Network::_icsneo_netid_t::icsneo_netid_swcan:
 				return &(cfg->swcan1);
 			default:
 				return nullptr;
@@ -85,7 +85,7 @@ public:
 
 	virtual std::vector<TerminationGroup> getTerminationGroups() const override {
 		return {
-			{ Network(Network::NetID::HSCAN) }
+			{ Network(Network::_icsneo_netid_t::icsneo_netid_hscan) }
 		};
 	}
 
diff --git a/include/icsneo/icsneoc.h b/include/icsneo/icsneoc.h
index 46b4023..15a71b1 100644
--- a/include/icsneo/icsneoc.h
+++ b/include/icsneo/icsneoc.h
@@ -313,7 +313,7 @@ extern bool DLLExport icsneo_removeMessageCallback(const neodevice_t* device, in
  * device. For instance, on a ValueCAN 4-2, the second CAN network is ICSNEO_NETID_HSCAN2, while
  * on a neoVI FIRE the second CAN network is ICSNEO_NETID_MSCAN.
  */
-extern neonetid_t DLLExport icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
+extern icsneo_netid_t DLLExport icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
 
 /**
  * \brief Get the friendly product name for a specified device.
@@ -474,7 +474,7 @@ extern bool DLLExport icsneo_settingsApplyStructureTemporary(const neodevice_t*
  * In the case of CAN, this function gets the standard CAN baudrate.
  * See icsneo_getFDBaudrate() to get the baudrate for (the baudrate-switched portion of) CAN FD.
  */
-extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, neonetid_t netid);
+extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, icsneo_netid_t netid);
 
 /**
  * \brief Set the network baudrate for a specified device.
@@ -488,7 +488,7 @@ extern int64_t DLLExport icsneo_getBaudrate(const neodevice_t* device, neonetid_
  *
  * Call icsneo_settingsApply() or similar to make the changes active on the device.
  */
-extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
+extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
 
 /**
  * \brief Get the CAN FD baudrate for a specified device.
@@ -498,7 +498,7 @@ extern bool DLLExport icsneo_setBaudrate(const neodevice_t* device, neonetid_t n
  *
  * See icsneo_getBaudrate() to get the baudrate for the non baudrate-switched portion of CAN FD, classical CAN 2.0, and other network types.
  */
-extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, neonetid_t netid);
+extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, icsneo_netid_t netid);
 
 /**
  * \brief Set the CAN FD baudrate for a specified device.
@@ -511,7 +511,7 @@ extern int64_t DLLExport icsneo_getFDBaudrate(const neodevice_t* device, neoneti
  *
  * Call icsneo_settingsApply() or similar to make the changes active on the device.
  */
-extern bool DLLExport icsneo_setFDBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
+extern bool DLLExport icsneo_setFDBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
 
 /**
  * \brief Transmit a single message.
@@ -764,7 +764,7 @@ extern bool DLLExport icsneo_setDigitalIO(const neodevice_t* device, neoio_t typ
  * group has termination enabled, check canTerminationBeEnabledFor
  * for that.
  */
-extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device, neonetid_t netid);
+extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device, icsneo_netid_t netid);
 
 /**
  * \brief Check whether software switchable termination can currently be enabled for a given network.
@@ -777,7 +777,7 @@ extern bool DLLExport icsneo_isTerminationSupportedFor(const neodevice_t* device
  * returned and an error will have been reported in
  * icsneo_getLastError().
  */
-extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* device, neonetid_t netid);
+extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* device, icsneo_netid_t netid);
 
 /**
  * \brief Check whether software switchable termination is currently
@@ -793,7 +793,7 @@ extern bool DLLExport icsneo_canTerminationBeEnabledFor(const neodevice_t* devic
  * False will be returned and an error will be set in
  * icsneo_getLastError if the setting is unreadable.
  */
-extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device, neonetid_t netid);
+extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device, icsneo_netid_t netid);
 
 /**
  * \brief Enable or disable software switchable termination for a given network.
@@ -806,7 +806,7 @@ extern bool DLLExport icsneo_isTerminationEnabledFor(const neodevice_t* device,
  * prior to the call, but the change does not need to be applied
  * to the device before enqueing the enable.
  */
-extern bool DLLExport icsneo_setTerminationFor(const neodevice_t* device, neonetid_t netid, bool enabled);
+extern bool DLLExport icsneo_setTerminationFor(const neodevice_t* device, icsneo_netid_t netid, bool enabled);
 
 /**
  * \brief Return the device status structures for a specified device.
@@ -908,7 +908,7 @@ fn_icsneo_addMessageCallback icsneo_addMessageCallback;
 typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id);
 fn_icsneo_removeMessageCallback icsneo_removeMessageCallback;
 
-typedef neonetid_t (*fn_icsneo_getNetworkByNumber)(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
+typedef icsneo_netid_t (*fn_icsneo_getNetworkByNumber)(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number);
 fn_icsneo_getNetworkByNumber icsneo_getNetworkByNumber;
 
 typedef bool(*fn_icsneo_getProductName)(const neodevice_t* device, char* str, size_t* maxLength);
@@ -938,16 +938,16 @@ fn_icsneo_settingsApplyStructure icsneo_settingsApplyStructure;
 typedef bool(*fn_icsneo_settingsApplyStructureTemporary)(const neodevice_t* device, const void* structure, size_t structureSize);
 fn_icsneo_settingsApplyStructureTemporary icsneo_settingsApplyStructureTemporary;
 
-typedef int64_t(*fn_icsneo_getBaudrate)(const neodevice_t* device, neonetid_t netid);
+typedef int64_t(*fn_icsneo_getBaudrate)(const neodevice_t* device, icsneo_netid_t netid);
 fn_icsneo_getBaudrate icsneo_getBaudrate;
 
-typedef bool(*fn_icsneo_setBaudrate)(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
+typedef bool(*fn_icsneo_setBaudrate)(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
 fn_icsneo_setBaudrate icsneo_setBaudrate;
 
-typedef int64_t(*fn_icsneo_getFDBaudrate)(const neodevice_t* device, neonetid_t netid);
+typedef int64_t(*fn_icsneo_getFDBaudrate)(const neodevice_t* device, icsneo_netid_t netid);
 fn_icsneo_getFDBaudrate icsneo_getFDBaudrate;
 
-typedef bool(*fn_icsneo_setFDBaudrate)(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate);
+typedef bool(*fn_icsneo_setFDBaudrate)(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate);
 fn_icsneo_setFDBaudrate icsneo_setFDBaudrate;
 
 typedef bool(*fn_icsneo_transmit)(const neodevice_t* device, const neomessage_t* message);
@@ -1004,16 +1004,16 @@ fn_icsneo_getDigitalIO icsneo_getDigitalIO;
 typedef bool(*fn_icsneo_setDigitalIO)(const neodevice_t* device, neoio_t type, uint32_t number, bool value);
 fn_icsneo_setDigitalIO icsneo_setDigitalIO;
 
-typedef bool(*fn_icsneo_isTerminationSupportedFor)(const neodevice_t* device, neonetid_t netid);
+typedef bool(*fn_icsneo_isTerminationSupportedFor)(const neodevice_t* device, icsneo_netid_t netid);
 fn_icsneo_isTerminationSupportedFor icsneo_isTerminationSupportedFor;
 
-typedef bool(*fn_icsneo_canTerminationBeEnabledFor)(const neodevice_t* device, neonetid_t netid);
+typedef bool(*fn_icsneo_canTerminationBeEnabledFor)(const neodevice_t* device, icsneo_netid_t netid);
 fn_icsneo_canTerminationBeEnabledFor icsneo_canTerminationBeEnabledFor;
 
-typedef bool(*fn_icsneo_isTerminationEnabledFor)(const neodevice_t* device, neonetid_t netid);
+typedef bool(*fn_icsneo_isTerminationEnabledFor)(const neodevice_t* device, icsneo_netid_t netid);
 fn_icsneo_isTerminationEnabledFor icsneo_isTerminationEnabledFor;
 
-typedef bool(*fn_icsneo_setTerminationFor)(const neodevice_t* device, neonetid_t netid, bool enabled);
+typedef bool(*fn_icsneo_setTerminationFor)(const neodevice_t* device, icsneo_netid_t netid, bool enabled);
 fn_icsneo_setTerminationFor icsneo_setTerminationFor;
 
 typedef int (*fn_icsneo_getDeviceStatus)(const neodevice_t* device, void* status, size_t* size);
diff --git a/platform/posix/firmio.cpp b/platform/posix/firmio.cpp
index 6752358..932e2fa 100644
--- a/platform/posix/firmio.cpp
+++ b/platform/posix/firmio.cpp
@@ -32,7 +32,7 @@ void FirmIO::Find(std::vector<FoundDevice>& found) {
 		return;
 
 	std::vector<uint8_t> payload = {
-		((1 << 4) | (uint8_t)Network::NetID::Main51), // Packet size of 1 on NETID_MAIN51
+		((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
 		(uint8_t)Command::RequestSerialNumber
 	};
 	payload.push_back(Packetizer::ICSChecksum(payload));
diff --git a/platform/posix/pcap.cpp b/platform/posix/pcap.cpp
index c10146c..2b842fc 100644
--- a/platform/posix/pcap.cpp
+++ b/platform/posix/pcap.cpp
@@ -126,7 +126,7 @@ void PCAP::Find(std::vector<FoundDevice>& found) {
 		memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC));
 		requestPacket.payload.reserve(4);
 		requestPacket.payload = {
-			((1 << 4) | (uint8_t)Network::NetID::Main51), // Packet size of 1 on NETID_MAIN51
+			((1 << 4) | (uint8_t)Network::_icsneo_netid_t::Main51), // Packet size of 1 on NETID_MAIN51
 			(uint8_t)Command::RequestSerialNumber
 		};
 		requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));
diff --git a/platform/windows/pcap.cpp b/platform/windows/pcap.cpp
index 198af09..2fdcf05 100644
--- a/platform/windows/pcap.cpp
+++ b/platform/windows/pcap.cpp
@@ -115,7 +115,7 @@ void PCAP::Find(std::vector<FoundDevice>& found) {
 		memcpy(requestPacket.srcMAC, iface.macAddress, sizeof(requestPacket.srcMAC));
 		requestPacket.payload.reserve(4);
 		requestPacket.payload = {
-			((1 << 4) | (uint8_t)Network::NetID::Main51), // Packet size of 1 on NETID_MAIN51
+			((1 << 4) | (uint8_t)Network::_icsneo_netid_t::icsneo_netid_main51), // Packet size of 1 on NETID_MAIN51
 			(uint8_t)Command::RequestSerialNumber
 		};
 		requestPacket.payload.push_back(Packetizer::ICSChecksum(requestPacket.payload));