diff --git a/docs/icsneocpp/examples.rst b/docs/icsneocpp/examples.rst
index a4d3df4..f9af24e 100644
--- a/docs/icsneocpp/examples.rst
+++ b/docs/icsneocpp/examples.rst
@@ -36,9 +36,9 @@ the arbitration ID.
    std::cout << "We got " << messages.size() << " messages!" << std::endl;
    for(auto& msg : messages) {
        switch(msg->network.getType()) {
-           case icsneo::icsneo_msg_bus_type_can:
-           case icsneo::icsneo_msg_bus_type_swcan:
-           case icsneo::icsneo_msg_bus_type_lsftcan: {
+           case icsneo_msg_bus_type_can:
+           case icsneo_msg_bus_type_swcan:
+           case icsneo_msg_bus_type_lsftcan: {
                // A message of type CAN is guaranteed to be a CANMessage, so we can static cast safely
                auto canmsg = std::static_pointer_cast<icsneo::CANMessage>(msg);
                // canmsg->arbid is valid here
diff --git a/examples/cpp/interactive/src/InteractiveExample.cpp b/examples/cpp/interactive/src/InteractiveExample.cpp
index bf7d6fa..3c821df 100644
--- a/examples/cpp/interactive/src/InteractiveExample.cpp
+++ b/examples/cpp/interactive/src/InteractiveExample.cpp
@@ -525,7 +525,7 @@ int main() {
 			/** Example of CAN FD
 			std::cout << "Transmitting an extended CAN FD frame... " << std::endl;
 			auto txMessage = std::make_shared<icsneo::CANMessage>();
-			txMessage->network = icsneo::icsneo_netid_hscan;
+			txMessage->network = 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
diff --git a/test/unit/a2bencoderdecodertest.cpp b/test/unit/a2bencoderdecodertest.cpp
index 32e731e..9363cbc 100644
--- a/test/unit/a2bencoderdecodertest.cpp
+++ b/test/unit/a2bencoderdecodertest.cpp
@@ -52,7 +52,7 @@ TEST_F(A2BEncoderDecoderTest, PacketEncoderTest)
 		true
 	);
 
-	messagePtr->network = icsneo::icsneo_netid_a2b2;
+	messagePtr->network = icsneo_netid_a2b2;
 	A2BMessage& message = *messagePtr.get();
 
 	message.setChannelSample(