diff --git a/README.md b/README.md
index c0f28acc..03c4531c 100644
--- a/README.md
+++ b/README.md
@@ -156,6 +156,14 @@ sudo cmake --install build
 
 Then, use a call to `find_package()` to find this package.
 
+### Use of our SAE/ISOBUS Manufacturer Code
+
+If you are integrating with our library to create an ISO11783 or J1939 application and are not selling your software or device containing that software for-profit, then you are welcome to use our manufacturer number in your application. 
+
+If you are creating such an application for sale as a for-profit company, then we ask that you please obtain your own manufacturer code from SAE instead of using ours.
+
+Our manufacturer code is 1407 (decimal).
+
 ## Documentation
 
 You can view the pre-compiled doxygen here https://delgrossoengineering.com/isobus-docs
diff --git a/examples/diagnostic_protocol/main.cpp b/examples/diagnostic_protocol/main.cpp
index 770d72e3..11e6f6a5 100644
--- a/examples/diagnostic_protocol/main.cpp
+++ b/examples/diagnostic_protocol/main.cpp
@@ -54,7 +54,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(0);
 	TestDeviceNAME.set_device_class(0);
@@ -63,7 +62,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
diff --git a/examples/guidance/main.cpp b/examples/guidance/main.cpp
index 6cf0730e..c7bd9058 100644
--- a/examples/guidance/main.cpp
+++ b/examples/guidance/main.cpp
@@ -91,7 +91,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -100,7 +99,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	isobus::AgriculturalGuidanceInterface TestGuidanceInterface(nullptr, nullptr);
 
diff --git a/examples/nmea2000/fast_packet_protocol/main.cpp b/examples/nmea2000/fast_packet_protocol/main.cpp
index 9cadf269..c2707131 100644
--- a/examples/nmea2000/fast_packet_protocol/main.cpp
+++ b/examples/nmea2000/fast_packet_protocol/main.cpp
@@ -74,7 +74,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(0);
 	TestDeviceNAME.set_device_class(0);
@@ -83,7 +82,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
diff --git a/examples/nmea2000/nmea2000_generator/main.cpp b/examples/nmea2000/nmea2000_generator/main.cpp
index 3827cc0d..85083408 100644
--- a/examples/nmea2000/nmea2000_generator/main.cpp
+++ b/examples/nmea2000/nmea2000_generator/main.cpp
@@ -52,7 +52,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(0);
 	TestDeviceNAME.set_device_class(0);
@@ -61,7 +60,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
diff --git a/examples/nmea2000/nmea2000_parser/main.cpp b/examples/nmea2000/nmea2000_parser/main.cpp
index f085f110..13af3956 100644
--- a/examples/nmea2000/nmea2000_parser/main.cpp
+++ b/examples/nmea2000/nmea2000_parser/main.cpp
@@ -127,7 +127,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(0);
 	TestDeviceNAME.set_device_class(0);
@@ -136,7 +135,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1D, 0);
 
diff --git a/examples/pgn_requests/main.cpp b/examples/pgn_requests/main.cpp
index 8ce95e43..18bf296f 100644
--- a/examples/pgn_requests/main.cpp
+++ b/examples/pgn_requests/main.cpp
@@ -115,7 +115,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -124,7 +123,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 	std::signal(SIGINT, signal_handler);
diff --git a/examples/task_controller_client/main.cpp b/examples/task_controller_client/main.cpp
index c37e5497..8e5d1a0d 100644
--- a/examples/task_controller_client/main.cpp
+++ b/examples/task_controller_client/main.cpp
@@ -63,7 +63,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(2);
 	TestDeviceNAME.set_device_class(6);
@@ -72,7 +71,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	const isobus::NAMEFilter filterTaskController(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::TaskController));
 	const isobus::NAMEFilter filterTaskControllerInstance(isobus::NAME::NAMEParameters::FunctionInstance, 0);
diff --git a/examples/transport_layer/main.cpp b/examples/transport_layer/main.cpp
index fa920606..33e06e15 100644
--- a/examples/transport_layer/main.cpp
+++ b/examples/transport_layer/main.cpp
@@ -57,7 +57,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -66,7 +65,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 
diff --git a/examples/virtual_terminal/aux_functions/main.cpp b/examples/virtual_terminal/aux_functions/main.cpp
index f1efffa8..722e8656 100644
--- a/examples/virtual_terminal/aux_functions/main.cpp
+++ b/examples/virtual_terminal/aux_functions/main.cpp
@@ -67,7 +67,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -76,7 +75,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(1);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	std::vector<std::uint8_t> testPool = isobus::IOPFileInterface::read_iop_file("aux_functions_pooldata.iop");
 
diff --git a/examples/virtual_terminal/aux_inputs/main.cpp b/examples/virtual_terminal/aux_inputs/main.cpp
index e44e07f9..49d12d07 100644
--- a/examples/virtual_terminal/aux_inputs/main.cpp
+++ b/examples/virtual_terminal/aux_inputs/main.cpp
@@ -130,7 +130,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -139,7 +138,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(1);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	std::vector<std::uint8_t> testPool = isobus::IOPFileInterface::read_iop_file("aux_inputs_pooldata.iop");
 
diff --git a/examples/virtual_terminal/esp32_platformio_object_pool/src/main.cpp b/examples/virtual_terminal/esp32_platformio_object_pool/src/main.cpp
index b85e6d6e..04746775 100644
--- a/examples/virtual_terminal/esp32_platformio_object_pool/src/main.cpp
+++ b/examples/virtual_terminal/esp32_platformio_object_pool/src/main.cpp
@@ -90,7 +90,6 @@ extern "C" void app_main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -99,7 +98,7 @@ extern "C" void app_main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	const std::uint8_t *testPool = object_pool_start;
 
diff --git a/examples/virtual_terminal/version3_object_pool/main.cpp b/examples/virtual_terminal/version3_object_pool/main.cpp
index 764afde4..373df909 100644
--- a/examples/virtual_terminal/version3_object_pool/main.cpp
+++ b/examples/virtual_terminal/version3_object_pool/main.cpp
@@ -109,7 +109,6 @@ int main()
 	isobus::NAME TestDeviceNAME(0);
 
 	//! Make sure you change these for your device!!!!
-	//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 	TestDeviceNAME.set_arbitrary_address_capable(true);
 	TestDeviceNAME.set_industry_group(1);
 	TestDeviceNAME.set_device_class(0);
@@ -118,7 +117,7 @@ int main()
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	std::vector<std::uint8_t> testPool = isobus::IOPFileInterface::read_iop_file("VT3TestPool.iop");
 
diff --git a/sphinx/source/Tutorials/Adding a Destination.rst b/sphinx/source/Tutorials/Adding a Destination.rst
index 83d6c579..60e19bd9 100644
--- a/sphinx/source/Tutorials/Adding a Destination.rst	
+++ b/sphinx/source/Tutorials/Adding a Destination.rst	
@@ -128,7 +128,6 @@ The final program for this tutorial (including the code from the previous Hello
       std::signal(SIGINT, signal_handler);
 
       //! Make sure you change these for your device!!!!
-      //! This is an example device that is using a manufacturer code that is currently unused at time of writing
       myNAME.set_arbitrary_address_capable(true);
       myNAME.set_industry_group(1);
       myNAME.set_device_class(0);
@@ -137,7 +136,7 @@ The final program for this tutorial (including the code from the previous Hello
       myNAME.set_ecu_instance(0);
       myNAME.set_function_instance(0);
       myNAME.set_device_class_instance(0);
-      myNAME.set_manufacturer_code(64);
+      myNAME.set_manufacturer_code(1407);
 
       // Define a NAME filter for our partner
       std::vector<isobus::NAMEFilter> myPartnerFilter;
diff --git a/sphinx/source/Tutorials/ESP32 PlatformIO.rst b/sphinx/source/Tutorials/ESP32 PlatformIO.rst
index 25b2127b..e1fd6fb7 100644
--- a/sphinx/source/Tutorials/ESP32 PlatformIO.rst	
+++ b/sphinx/source/Tutorials/ESP32 PlatformIO.rst	
@@ -198,7 +198,6 @@ This is boilerplate code that can be found in nearly every AgIsoStack project th
 		isobus::NAME TestDeviceNAME(0);
 
 		//! Make sure you change these for your device!!!!
-		//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 		TestDeviceNAME.set_arbitrary_address_capable(true);
 		TestDeviceNAME.set_industry_group(1);
 		TestDeviceNAME.set_device_class(0);
@@ -207,7 +206,7 @@ This is boilerplate code that can be found in nearly every AgIsoStack project th
 		TestDeviceNAME.set_ecu_instance(0);
 		TestDeviceNAME.set_function_instance(0);
 		TestDeviceNAME.set_device_class_instance(0);
-		TestDeviceNAME.set_manufacturer_code(64);
+		TestDeviceNAME.set_manufacturer_code(1407);
 		auto TestInternalECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x81, 0);
 
 		while (true)
diff --git a/sphinx/source/Tutorials/Receiving Messages.rst b/sphinx/source/Tutorials/Receiving Messages.rst
index 403f55b5..479a0511 100644
--- a/sphinx/source/Tutorials/Receiving Messages.rst	
+++ b/sphinx/source/Tutorials/Receiving Messages.rst	
@@ -113,7 +113,6 @@ So, our updated tutorial program now should look like this:
       std::signal(SIGINT, signal_handler);
 
       //! Make sure you change these for your device!!!!
-      //! This is an example device that is using a manufacturer code that is currently unused at time of writing
       myNAME.set_arbitrary_address_capable(true);
       myNAME.set_industry_group(1);
       myNAME.set_device_class(0);
@@ -122,7 +121,7 @@ So, our updated tutorial program now should look like this:
       myNAME.set_ecu_instance(0);
       myNAME.set_function_instance(0);
       myNAME.set_device_class_instance(0);
-      myNAME.set_manufacturer_code(64);
+      myNAME.set_manufacturer_code(1407);
 
       // Create our InternalControlFunction
       myECU = isobus::InternalControlFunction::create(myNAME, 0x1C, 0);
diff --git a/sphinx/source/Tutorials/The ISOBUS Hello World.rst b/sphinx/source/Tutorials/The ISOBUS Hello World.rst
index b4149a3e..8aac9db3 100644
--- a/sphinx/source/Tutorials/The ISOBUS Hello World.rst	
+++ b/sphinx/source/Tutorials/The ISOBUS Hello World.rst	
@@ -92,12 +92,12 @@ Now we have a NAME instantiated. We still need to populate it with our control f
     myNAME.set_ecu_instance(0);
     myNAME.set_function_instance(0);
     myNAME.set_device_class_instance(0);
-    myNAME.set_manufacturer_code(64);
+    myNAME.set_manufacturer_code(1407);
 
     return 0;
    }
 
-So now, we have a NAME with actual information encoded in it. In this example, we are an on-highway steering controller, our serial number is 2, we support address arbitration, and we claim to be manufactured by manufacturer 64, which is currently an unused code (but was formerly "SpectraPhysics").
+So now, we have a NAME with actual information encoded in it. In this example, we are an on-highway steering controller, our serial number is 2, we support address arbitration, and we claim to be manufactured by manufacturer 1407 which is the Open-Agriculture manufacturer code.
 
 Make sure to change these values to match your device's identity. Use `"isobus.net" <https://www.isobus.net/isobus/>`_ as a resource if you need to figure out all these values.\
 
@@ -127,7 +127,6 @@ In this example, I'll use a shared_ptr to store my InternalControlFunction, but
     std::shared_ptr<isobus::InternalControlFunction> myECU = nullptr; // A pointer to hold our InternalControlFunction
 
     //! Make sure you change these for your device!!!!
-    //! This is an example device that is using a manufacturer code that is currently unused at time of writing
     myNAME.set_arbitrary_address_capable(true);
     myNAME.set_industry_group(1);
     myNAME.set_device_class(0);
@@ -136,7 +135,7 @@ In this example, I'll use a shared_ptr to store my InternalControlFunction, but
     myNAME.set_ecu_instance(0);
     myNAME.set_function_instance(0);
     myNAME.set_device_class_instance(0);
-    myNAME.set_manufacturer_code(64);
+    myNAME.set_manufacturer_code(1407);
 
     // Create our InternalControlFunction
     myECU = isobus::InternalControlFunction::create(myNAME, 0x1C, 0);
@@ -228,7 +227,6 @@ Let's see what we've got so far:
       }
 
       //! Make sure you change these for your device!!!!
-      //! This is an example device that is using a manufacturer code that is currently unused at time of writing
       myNAME.set_arbitrary_address_capable(true);
       myNAME.set_industry_group(1);
       myNAME.set_device_class(0);
@@ -237,7 +235,7 @@ Let's see what we've got so far:
       myNAME.set_ecu_instance(0);
       myNAME.set_function_instance(0);
       myNAME.set_device_class_instance(0);
-      myNAME.set_manufacturer_code(64);
+      myNAME.set_manufacturer_code(1407);
 
       // Create our InternalControlFunction
       myECU = isobus::InternalControlFunction::create(myNAME, 0x1C, 0);
@@ -293,7 +291,6 @@ Make sure to include `csignal`.
       std::signal(SIGINT, signal_handler);
 
       //! Make sure you change these for your device!!!!
-      //! This is an example device that is using a manufacturer code that is currently unused at time of writing
       myNAME.set_arbitrary_address_capable(true);
       myNAME.set_industry_group(1);
       myNAME.set_device_class(0);
@@ -302,7 +299,7 @@ Make sure to include `csignal`.
       myNAME.set_ecu_instance(0);
       myNAME.set_function_instance(0);
       myNAME.set_device_class_instance(0);
-      myNAME.set_manufacturer_code(64);
+      myNAME.set_manufacturer_code(1407);
 
       // Create our InternalControlFunction
       myECU = isobus::InternalControlFunction::create(myNAME, 0x1C, 0);
@@ -361,7 +358,6 @@ The total result:
     std::signal(SIGINT, signal_handler);
 
     //! Make sure you change these for your device!!!!
-    //! This is an example device that is using a manufacturer code that is currently unused at time of writing
     myNAME.set_arbitrary_address_capable(true);
     myNAME.set_industry_group(1);
     myNAME.set_device_class(0);
@@ -370,7 +366,7 @@ The total result:
     myNAME.set_ecu_instance(0);
     myNAME.set_function_instance(0);
     myNAME.set_device_class_instance(0);
-    myNAME.set_manufacturer_code(64);
+    myNAME.set_manufacturer_code(1407);
 
     // Create our InternalControlFunction
     myECU = isobus::InternalControlFunction::create(myNAME, 0x1C, 0);
diff --git a/sphinx/source/Tutorials/Virtual Terminal Basics.rst b/sphinx/source/Tutorials/Virtual Terminal Basics.rst
index bb2b2802..acbe11fa 100644
--- a/sphinx/source/Tutorials/Virtual Terminal Basics.rst	
+++ b/sphinx/source/Tutorials/Virtual Terminal Basics.rst	
@@ -103,7 +103,6 @@ Create the file `main.cpp` as shown below inside that folder with the requisite
 		isobus::NAME TestDeviceNAME(0);
 
 		//! Make sure you change these for your device!!!!
-		//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 		TestDeviceNAME.set_arbitrary_address_capable(true);
 		TestDeviceNAME.set_industry_group(1);
 		TestDeviceNAME.set_device_class(0);
@@ -112,7 +111,7 @@ Create the file `main.cpp` as shown below inside that folder with the requisite
 		TestDeviceNAME.set_ecu_instance(0);
 		TestDeviceNAME.set_function_instance(0);
 		TestDeviceNAME.set_device_class_instance(0);
-		TestDeviceNAME.set_manufacturer_code(64);
+		TestDeviceNAME.set_manufacturer_code(1407);
 
 		const isobus::NAMEFilter filterVirtualTerminal(isobus::NAME::NAMEParameters::FunctionCode, static_cast<std::uint8_t>(isobus::NAME::Function::VirtualTerminal));
 		const std::vector<isobus::NAMEFilter> vtNameFilters = { filterVirtualTerminal };
@@ -495,7 +494,6 @@ Here's the final code for this example:
 		isobus::NAME TestDeviceNAME(0);
 
 		//! Make sure you change these for your device!!!!
-		//! This is an example device that is using a manufacturer code that is currently unused at time of writing
 		TestDeviceNAME.set_arbitrary_address_capable(true);
 		TestDeviceNAME.set_industry_group(1);
 		TestDeviceNAME.set_device_class(0);
@@ -504,7 +502,7 @@ Here's the final code for this example:
 		TestDeviceNAME.set_ecu_instance(0);
 		TestDeviceNAME.set_function_instance(0);
 		TestDeviceNAME.set_device_class_instance(0);
-		TestDeviceNAME.set_manufacturer_code(64);
+		TestDeviceNAME.set_manufacturer_code(1407);
 
 		std::vector<std::uint8_t> testPool = isobus::IOPFileInterface::read_iop_file("VT3TestPool.iop");
 
diff --git a/test/core_network_management_tests.cpp b/test/core_network_management_tests.cpp
index 5f14fb4f..8fc3fd22 100644
--- a/test/core_network_management_tests.cpp
+++ b/test/core_network_management_tests.cpp
@@ -48,7 +48,7 @@ TEST(CORE_TESTS, TestCreateAndDestroyICFs)
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testICF1 = isobus::InternalControlFunction::create(TestDeviceNAME, 0x1C, 0);
 
@@ -112,7 +112,7 @@ TEST(CORE_TESTS, CommandedAddress)
 	TestDeviceNAME.set_ecu_instance(1);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x43, 0);
 
diff --git a/test/diagnostic_protocol_tests.cpp b/test/diagnostic_protocol_tests.cpp
index dfebc573..1e8acf50 100644
--- a/test/diagnostic_protocol_tests.cpp
+++ b/test/diagnostic_protocol_tests.cpp
@@ -42,7 +42,7 @@ TEST(DIAGNOSTIC_PROTOCOL_TESTS, MessageEncoding)
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto TestInternalECU = InternalControlFunction::create(TestDeviceNAME, 0xAA, 0);
 
diff --git a/test/guidance_tests.cpp b/test/guidance_tests.cpp
index 56de0d92..74faf995 100644
--- a/test/guidance_tests.cpp
+++ b/test/guidance_tests.cpp
@@ -73,7 +73,7 @@ TEST(GUIDANCE_TESTS, GuidanceMessages)
 	TestDeviceNAME.set_ecu_instance(4);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x44, 0);
 
diff --git a/test/language_command_interface_tests.cpp b/test/language_command_interface_tests.cpp
index 7b6fb8a1..cfc1299f 100644
--- a/test/language_command_interface_tests.cpp
+++ b/test/language_command_interface_tests.cpp
@@ -203,7 +203,7 @@ TEST(LANGUAGE_COMMAND_INTERFACE_TESTS, SettersAndTransmitting)
 	TestDeviceNAME.set_ecu_instance(5);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x49, 0);
 	std::uint32_t waitingTimestamp_ms = SystemTiming::get_timestamp_ms();
diff --git a/test/maintain_power_tests.cpp b/test/maintain_power_tests.cpp
index 93e96858..646316ac 100644
--- a/test/maintain_power_tests.cpp
+++ b/test/maintain_power_tests.cpp
@@ -63,7 +63,7 @@ TEST(MAINTAIN_POWER_TESTS, MessageParsing)
 	TestDeviceNAME.set_ecu_instance(5);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x82, 0);
 	std::uint32_t waitingTimestamp_ms = SystemTiming::get_timestamp_ms();
@@ -263,7 +263,7 @@ TEST(MAINTAIN_POWER_TESTS, MessageEncoding)
 	TestDeviceNAME.set_ecu_instance(5);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x48, 0);
 	std::uint32_t waitingTimestamp_ms = SystemTiming::get_timestamp_ms();
diff --git a/test/nmea2000_message_tests.cpp b/test/nmea2000_message_tests.cpp
index 2be47bb0..8608955c 100644
--- a/test/nmea2000_message_tests.cpp
+++ b/test/nmea2000_message_tests.cpp
@@ -428,7 +428,7 @@ TEST(NMEA2000_Tests, NMEA2KInterface)
 	TestDeviceNAME.set_ecu_instance(4);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x51, 0);
 
@@ -459,7 +459,7 @@ TEST(NMEA2000_Tests, NMEA2KInterface)
 	TestDeviceNAME.set_ecu_instance(0);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 	testFrame.dataLength = 8;
 	testFrame.channel = 0;
 	testFrame.isExtendedFrame = true;
diff --git a/test/speed_distance_message_tests.cpp b/test/speed_distance_message_tests.cpp
index 90113283..2f30507a 100644
--- a/test/speed_distance_message_tests.cpp
+++ b/test/speed_distance_message_tests.cpp
@@ -101,7 +101,7 @@ TEST(SPEED_MESSAGE_TESTS, SpeedMessages)
 	TestDeviceNAME.set_ecu_instance(5);
 	TestDeviceNAME.set_function_instance(0);
 	TestDeviceNAME.set_device_class_instance(0);
-	TestDeviceNAME.set_manufacturer_code(64);
+	TestDeviceNAME.set_manufacturer_code(1407);
 
 	auto testECU = isobus::InternalControlFunction::create(TestDeviceNAME, 0x45, 0);
 
diff --git a/test/vt_client_tests.cpp b/test/vt_client_tests.cpp
index 91cf4ac9..e489cba3 100644
--- a/test/vt_client_tests.cpp
+++ b/test/vt_client_tests.cpp
@@ -872,7 +872,7 @@ TEST(VIRTUAL_TERMINAL_TESTS, MessageConstruction)
 	serverNAME.set_device_class(1);
 	serverNAME.set_function_code(29);
 	serverNAME.set_identity_number(645);
-	serverNAME.set_manufacturer_code(64);
+	serverNAME.set_manufacturer_code(1407);
 	std::uint64_t serverFullNAME = serverNAME.get_full_name();
 
 	testFrame.dataLength = 8;