diff --git a/latest/Firmware/NMEA200Adapter/.cproject b/latest/Firmware/NMEA2000Adapter/.cproject
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.cproject
rename to latest/Firmware/NMEA2000Adapter/.cproject
diff --git a/latest/Firmware/NMEA200Adapter/.gitignore b/latest/Firmware/NMEA2000Adapter/.gitignore
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.gitignore
rename to latest/Firmware/NMEA2000Adapter/.gitignore
diff --git a/latest/Firmware/NMEA200Adapter/.mxproject b/latest/Firmware/NMEA2000Adapter/.mxproject
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.mxproject
rename to latest/Firmware/NMEA2000Adapter/.mxproject
diff --git a/latest/Firmware/NMEA200Adapter/.project b/latest/Firmware/NMEA2000Adapter/.project
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.project
rename to latest/Firmware/NMEA2000Adapter/.project
diff --git a/latest/Firmware/NMEA200Adapter/.settings/org.eclipse.cdt.core.prefs b/latest/Firmware/NMEA2000Adapter/.settings/org.eclipse.cdt.core.prefs
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.settings/org.eclipse.cdt.core.prefs
rename to latest/Firmware/NMEA2000Adapter/.settings/org.eclipse.cdt.core.prefs
diff --git a/latest/Firmware/NMEA200Adapter/.settings/org.eclipse.embedcdt.managedbuild.cross.arm.core.prefs b/latest/Firmware/NMEA2000Adapter/.settings/org.eclipse.embedcdt.managedbuild.cross.arm.core.prefs
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/.settings/org.eclipse.embedcdt.managedbuild.cross.arm.core.prefs
rename to latest/Firmware/NMEA2000Adapter/.settings/org.eclipse.embedcdt.managedbuild.cross.arm.core.prefs
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/CircularQueue.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/CircularQueue.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/CircularQueue.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/CircularQueue.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/Config.h b/latest/Firmware/NMEA2000Adapter/Core/Inc/Config.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/Config.h
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/Config.h
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/DebugMsgHandler.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/DebugMsgHandler.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/DebugMsgHandler.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/DebugMsgHandler.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/EventQueue.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/EventQueue.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/EventQueue.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/EventQueue.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/EventTypes.h b/latest/Firmware/NMEA2000Adapter/Core/Inc/EventTypes.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/EventTypes.h
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/EventTypes.h
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/Events.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/Events.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/Events.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/Events.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/NMEA0183Consumer.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/NMEA0183Consumer.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/NMEA0183Consumer.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/NMEA0183Consumer.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/NMEASentence.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/NMEASentence.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/NMEASentence.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/NMEASentence.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/ObjectPool.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/ObjectPool.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/ObjectPool.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/ObjectPool.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/Utils.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/Utils.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/Utils.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/Utils.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/bsp/bsp.hpp b/latest/Firmware/NMEA2000Adapter/Core/Inc/bsp/bsp.hpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/bsp/bsp.hpp
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/bsp/bsp.hpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/stm32l4xx_hal_conf.h b/latest/Firmware/NMEA2000Adapter/Core/Inc/stm32l4xx_hal_conf.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/stm32l4xx_hal_conf.h
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/stm32l4xx_hal_conf.h
diff --git a/latest/Firmware/NMEA200Adapter/Core/Inc/stm32l4xx_it.h b/latest/Firmware/NMEA2000Adapter/Core/Inc/stm32l4xx_it.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Inc/stm32l4xx_it.h
rename to latest/Firmware/NMEA2000Adapter/Core/Inc/stm32l4xx_it.h
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/DebugMsgHandler.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/DebugMsgHandler.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/DebugMsgHandler.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/DebugMsgHandler.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/EventQueue.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/EventQueue.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/EventQueue.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/EventQueue.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/Events.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/Events.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/Events.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/Events.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/NMEA0183Consumer.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/NMEA0183Consumer.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/NMEA0183Consumer.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/NMEA0183Consumer.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/NMEASentence.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/NMEASentence.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/NMEASentence.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/NMEASentence.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/Utils.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/Utils.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/Utils.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/Utils.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/bsp/board_2.0.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/bsp/board_2.0.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/bsp/board_2.0.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/bsp/board_2.0.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/bsp/poc_board.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/bsp/poc_board.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/bsp/poc_board.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/bsp/poc_board.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/main.cpp b/latest/Firmware/NMEA2000Adapter/Core/Src/main.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/main.cpp
rename to latest/Firmware/NMEA2000Adapter/Core/Src/main.cpp
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/stm32l4xx_hal_msp.c b/latest/Firmware/NMEA2000Adapter/Core/Src/stm32l4xx_hal_msp.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/stm32l4xx_hal_msp.c
rename to latest/Firmware/NMEA2000Adapter/Core/Src/stm32l4xx_hal_msp.c
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/stm32l4xx_it.c b/latest/Firmware/NMEA2000Adapter/Core/Src/stm32l4xx_it.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/stm32l4xx_it.c
rename to latest/Firmware/NMEA2000Adapter/Core/Src/stm32l4xx_it.c
diff --git a/latest/Firmware/NMEA200Adapter/Core/Src/system_stm32l4xx.c b/latest/Firmware/NMEA2000Adapter/Core/Src/system_stm32l4xx.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Core/Src/system_stm32l4xx.c
rename to latest/Firmware/NMEA2000Adapter/Core/Src/system_stm32l4xx.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l412xx.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l412xx.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l412xx.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l412xx.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l422xx.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l422xx.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l422xx.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l422xx.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l431xx.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l431xx.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l431xx.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l431xx.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4xx.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4xx.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4xx.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4xx.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/system_stm32l4xx.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/system_stm32l4xx.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/system_stm32l4xx.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Device/ST/STM32L4xx/Include/system_stm32l4xx.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armcc.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armcc.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armcc.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armcc.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armclang.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armclang.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armclang.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armclang.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armclang_ltm.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armclang_ltm.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_armclang_ltm.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_armclang_ltm.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_compiler.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_compiler.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_compiler.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_compiler.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_gcc.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_gcc.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_gcc.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_gcc.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_iccarm.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_iccarm.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_iccarm.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_iccarm.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_version.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_version.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/cmsis_version.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/cmsis_version.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv81mml.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv81mml.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv81mml.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv81mml.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv8mbl.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv8mbl.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv8mbl.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv8mbl.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv8mml.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv8mml.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_armv8mml.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_armv8mml.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm0.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm0.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm0.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm0.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm0plus.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm0plus.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm0plus.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm0plus.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm1.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm1.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm1.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm1.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm23.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm23.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm23.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm23.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm3.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm3.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm3.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm3.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm33.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm33.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm33.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm33.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm35p.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm35p.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm35p.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm35p.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm4.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm4.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm4.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm4.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm7.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm7.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_cm7.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_cm7.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_sc000.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_sc000.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_sc000.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_sc000.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_sc300.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_sc300.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/core_sc300.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/core_sc300.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/mpu_armv7.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/mpu_armv7.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/mpu_armv7.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/mpu_armv7.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/mpu_armv8.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/mpu_armv8.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/mpu_armv8.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/mpu_armv8.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/tz_context.h b/latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/tz_context.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/CMSIS/Include/tz_context.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/CMSIS/Include/tz_context.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cortex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cortex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cortex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cortex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_def.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_def.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_def.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_def.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_exti.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_exti.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_exti.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_exti.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ramfunc.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ramfunc.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ramfunc.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_flash_ramfunc.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_iwdg.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_iwdg.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_iwdg.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_iwdg.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_pwr_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_rcc_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_spi_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_tim_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_uart_ex.h
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_iwdg.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_iwdg.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_iwdg.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_iwdg.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c
diff --git a/latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c b/latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c
rename to latest/Firmware/NMEA2000Adapter/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c
diff --git a/latest/Firmware/NMEA200Adapter/Python/bootloader.py b/latest/Firmware/NMEA2000Adapter/Python/bootloader.py
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/Python/bootloader.py
rename to latest/Firmware/NMEA2000Adapter/Python/bootloader.py
diff --git a/latest/Firmware/NMEA200Adapter/README.md b/latest/Firmware/NMEA2000Adapter/README.md
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/README.md
rename to latest/Firmware/NMEA2000Adapter/README.md
diff --git a/latest/Firmware/NMEA200Adapter/STM32L412KBUx_FLASH.ld b/latest/Firmware/NMEA2000Adapter/STM32L412KBUx_FLASH.ld
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/STM32L412KBUx_FLASH.ld
rename to latest/Firmware/NMEA2000Adapter/STM32L412KBUx_FLASH.ld
diff --git a/latest/Firmware/NMEA200Adapter/STM32L422KBUx_FLASH.ld b/latest/Firmware/NMEA2000Adapter/STM32L422KBUx_FLASH.ld
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/STM32L422KBUx_FLASH.ld
rename to latest/Firmware/NMEA2000Adapter/STM32L422KBUx_FLASH.ld
diff --git a/latest/Firmware/NMEA200Adapter/STM32L431KBUx_FLASH.ld b/latest/Firmware/NMEA2000Adapter/STM32L431KBUx_FLASH.ld
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/STM32L431KBUx_FLASH.ld
rename to latest/Firmware/NMEA2000Adapter/STM32L431KBUx_FLASH.ld
diff --git a/latest/Firmware/NMEA200Adapter/ais/CMakeLists.txt b/latest/Firmware/NMEA2000Adapter/ais/CMakeLists.txt
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/CMakeLists.txt
rename to latest/Firmware/NMEA2000Adapter/ais/CMakeLists.txt
diff --git a/latest/Firmware/NMEA200Adapter/ais/Makefile-custom b/latest/Firmware/NMEA2000Adapter/ais/Makefile-custom
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/Makefile-custom
rename to latest/Firmware/NMEA2000Adapter/ais/Makefile-custom
diff --git a/latest/Firmware/NMEA200Adapter/ais/Makefile.am b/latest/Firmware/NMEA2000Adapter/ais/Makefile.am
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/Makefile.am
rename to latest/Firmware/NMEA2000Adapter/ais/Makefile.am
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais.h b/latest/Firmware/NMEA2000Adapter/ais/ais.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais.h
rename to latest/Firmware/NMEA2000Adapter/ais/ais.h
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais10.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais10.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais10.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais10.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais12.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais12.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais12.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais12.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais14.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais14.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais14.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais14.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais15.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais15.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais15.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais15.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais16.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais16.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais16.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais16.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais17.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais17.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais17.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais17.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais18.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais18.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais18.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais18.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais19.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais19.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais19.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais19.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais1_2_3.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais1_2_3.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais1_2_3.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais1_2_3.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais20.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais20.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais20.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais20.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais21.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais21.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais21.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais21.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais22.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais22.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais22.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais22.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais23.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais23.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais23.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais23.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais24.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais24.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais24.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais24.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais25.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais25.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais25.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais25.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais26.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais26.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais26.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais26.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais27.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais27.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais27.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais27.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais4_11.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais4_11.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais4_11.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais4_11.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais5.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais5.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais5.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais5.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais6.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais6.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais6.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais6.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais7_13.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais7_13.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais7_13.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais7_13.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_1_22.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_1_22.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_1_22.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_1_22.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_1_26.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_1_26.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_1_26.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_1_26.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_200.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_200.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_200.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_200.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_366.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_366.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_366.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_366.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_366_22.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_366_22.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_366_22.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_366_22.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais8_367.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais8_367.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais8_367.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais8_367.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais9.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais9.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais9.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais9.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/ais_bitset.cpp b/latest/Firmware/NMEA2000Adapter/ais/ais_bitset.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/ais_bitset.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/ais_bitset.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/decode_body.cpp b/latest/Firmware/NMEA2000Adapter/ais/decode_body.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/decode_body.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/decode_body.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/decode_body.h b/latest/Firmware/NMEA2000Adapter/ais/decode_body.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/decode_body.h
rename to latest/Firmware/NMEA2000Adapter/ais/decode_body.h
diff --git a/latest/Firmware/NMEA200Adapter/ais/vdm.cpp b/latest/Firmware/NMEA2000Adapter/ais/vdm.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/vdm.cpp
rename to latest/Firmware/NMEA2000Adapter/ais/vdm.cpp
diff --git a/latest/Firmware/NMEA200Adapter/ais/vdm.h b/latest/Firmware/NMEA2000Adapter/ais/vdm.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/ais/vdm.h
rename to latest/Firmware/NMEA2000Adapter/ais/vdm.h
diff --git a/latest/Firmware/NMEA200Adapter/maiana-n2k.ioc b/latest/Firmware/NMEA2000Adapter/maiana-n2k.ioc
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/maiana-n2k.ioc
rename to latest/Firmware/NMEA2000Adapter/maiana-n2k.ioc
diff --git a/latest/Firmware/NMEA200Adapter/maiana-n2k.xml b/latest/Firmware/NMEA2000Adapter/maiana-n2k.xml
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/maiana-n2k.xml
rename to latest/Firmware/NMEA2000Adapter/maiana-n2k.xml
diff --git a/latest/Firmware/NMEA200Adapter/mcp_can/README.md b/latest/Firmware/NMEA2000Adapter/mcp_can/README.md
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/mcp_can/README.md
rename to latest/Firmware/NMEA2000Adapter/mcp_can/README.md
diff --git a/latest/Firmware/NMEA200Adapter/mcp_can/mcp_can.cpp b/latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/mcp_can/mcp_can.cpp
rename to latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can.cpp
diff --git a/latest/Firmware/NMEA200Adapter/mcp_can/mcp_can.h b/latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/mcp_can/mcp_can.h
rename to latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can.h
diff --git a/latest/Firmware/NMEA200Adapter/mcp_can/mcp_can_dfs.h b/latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can_dfs.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/mcp_can/mcp_can_dfs.h
rename to latest/Firmware/NMEA2000Adapter/mcp_can/mcp_can_dfs.h
diff --git a/latest/Firmware/NMEA200Adapter/n2k_mcp/NMEA2000_mcp.cpp b/latest/Firmware/NMEA2000Adapter/n2k_mcp/NMEA2000_mcp.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/n2k_mcp/NMEA2000_mcp.cpp
rename to latest/Firmware/NMEA2000Adapter/n2k_mcp/NMEA2000_mcp.cpp
diff --git a/latest/Firmware/NMEA200Adapter/n2k_mcp/NMEA2000_mcp.h b/latest/Firmware/NMEA2000Adapter/n2k_mcp/NMEA2000_mcp.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/n2k_mcp/NMEA2000_mcp.h
rename to latest/Firmware/NMEA2000Adapter/n2k_mcp/NMEA2000_mcp.h
diff --git a/latest/Firmware/NMEA200Adapter/n2k_mcp/README.adoc b/latest/Firmware/NMEA2000Adapter/n2k_mcp/README.adoc
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/n2k_mcp/README.adoc
rename to latest/Firmware/NMEA2000Adapter/n2k_mcp/README.adoc
diff --git a/latest/Firmware/NMEA200Adapter/n2k_mcp/library.properties b/latest/Firmware/NMEA2000Adapter/n2k_mcp/library.properties
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/n2k_mcp/library.properties
rename to latest/Firmware/NMEA2000Adapter/n2k_mcp/library.properties
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/ActisenseReader.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/ActisenseReader.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/ActisenseReader.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/ActisenseReader.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/ActisenseReader.h b/latest/Firmware/NMEA2000Adapter/nmea2000/ActisenseReader.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/ActisenseReader.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/ActisenseReader.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/CMakeLists.txt b/latest/Firmware/NMEA2000Adapter/nmea2000/CMakeLists.txt
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/CMakeLists.txt
rename to latest/Firmware/NMEA2000Adapter/nmea2000/CMakeLists.txt
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kCANMsg.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kCANMsg.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kCANMsg.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kCANMsg.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kDef.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kDef.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kDef.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kDef.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kDeviceList.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kDeviceList.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kDeviceList.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kDeviceList.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kDeviceList.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kDeviceList.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kDeviceList.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kDeviceList.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunction.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunction.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunction.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunction.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunction.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunction.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunction.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunction.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kGroupFunctionDefaultHandlers.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMaretron.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMaretron.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMaretron.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMaretron.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMaretron.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMaretron.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMaretron.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMaretron.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMessages.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessages.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMessages.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessages.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMessages.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessages.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMessages.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessages.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMessagesEnumToStr.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessagesEnumToStr.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMessagesEnumToStr.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMessagesEnumToStr.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMsg.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMsg.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMsg.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMsg.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kMsg.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kMsg.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kMsg.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kMsg.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kStream.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kStream.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kStream.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kStream.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kStream.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kStream.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kStream.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kStream.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/N2kTypes.h b/latest/Firmware/NMEA2000Adapter/nmea2000/N2kTypes.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/N2kTypes.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/N2kTypes.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000.h b/latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000StdTypes.h b/latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000StdTypes.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000StdTypes.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000StdTypes.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000_CAN.h b/latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000_CAN.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000_CAN.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000_CAN.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000_CompilerDefns.h b/latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000_CompilerDefns.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/NMEA2000_CompilerDefns.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/NMEA2000_CompilerDefns.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/RingBuffer.h b/latest/Firmware/NMEA2000Adapter/nmea2000/RingBuffer.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/RingBuffer.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/RingBuffer.h
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/RingBuffer.tpp b/latest/Firmware/NMEA2000Adapter/nmea2000/RingBuffer.tpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/RingBuffer.tpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/RingBuffer.tpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/Seasmart.cpp b/latest/Firmware/NMEA2000Adapter/nmea2000/Seasmart.cpp
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/Seasmart.cpp
rename to latest/Firmware/NMEA2000Adapter/nmea2000/Seasmart.cpp
diff --git a/latest/Firmware/NMEA200Adapter/nmea2000/Seasmart.h b/latest/Firmware/NMEA2000Adapter/nmea2000/Seasmart.h
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/nmea2000/Seasmart.h
rename to latest/Firmware/NMEA2000Adapter/nmea2000/Seasmart.h
diff --git a/latest/Firmware/NMEA200Adapter/startup/startup_stm32l422xx.S b/latest/Firmware/NMEA2000Adapter/startup/startup_stm32l422xx.S
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/startup/startup_stm32l422xx.S
rename to latest/Firmware/NMEA2000Adapter/startup/startup_stm32l422xx.S
diff --git a/latest/Firmware/NMEA200Adapter/startup/startup_stm32l431xx.S b/latest/Firmware/NMEA2000Adapter/startup/startup_stm32l431xx.S
similarity index 100%
rename from latest/Firmware/NMEA200Adapter/startup/startup_stm32l431xx.S
rename to latest/Firmware/NMEA2000Adapter/startup/startup_stm32l431xx.S