diff --git a/docs/project-state.md b/docs/project-state.md
index 71d0a6b..3ed7444 100644
--- a/docs/project-state.md
+++ b/docs/project-state.md
@@ -264,7 +264,7 @@ ESP32 Firmware
 
 Location
 
-firmware/esp32/xterra-controller/
+firmware/esp32/overland-controller/
 
 Implemented
 
diff --git a/firmware/esp32/xterra-controller/alarms.cpp b/firmware/esp32/overland-controller/alarms.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/alarms.cpp
rename to firmware/esp32/overland-controller/alarms.cpp
diff --git a/firmware/esp32/xterra-controller/alarms.h b/firmware/esp32/overland-controller/alarms.h
similarity index 100%
rename from firmware/esp32/xterra-controller/alarms.h
rename to firmware/esp32/overland-controller/alarms.h
diff --git a/firmware/esp32/xterra-controller/app_config.cpp b/firmware/esp32/overland-controller/app_config.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/app_config.cpp
rename to firmware/esp32/overland-controller/app_config.cpp
diff --git a/firmware/esp32/xterra-controller/app_config.h b/firmware/esp32/overland-controller/app_config.h
similarity index 100%
rename from firmware/esp32/xterra-controller/app_config.h
rename to firmware/esp32/overland-controller/app_config.h
diff --git a/firmware/esp32/xterra-controller/bms.cpp b/firmware/esp32/overland-controller/bms.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/bms.cpp
rename to firmware/esp32/overland-controller/bms.cpp
diff --git a/firmware/esp32/xterra-controller/bms.h b/firmware/esp32/overland-controller/bms.h
similarity index 100%
rename from firmware/esp32/xterra-controller/bms.h
rename to firmware/esp32/overland-controller/bms.h
diff --git a/firmware/esp32/xterra-controller/config.h b/firmware/esp32/overland-controller/config.h
similarity index 89%
rename from firmware/esp32/xterra-controller/config.h
rename to firmware/esp32/overland-controller/config.h
index 08a3a35..5d2ea7b 100644
--- a/firmware/esp32/xterra-controller/config.h
+++ b/firmware/esp32/overland-controller/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define DEVICE_NAME "Xterra Controller"
+#define DEVICE_NAME "Overland Controller"
 
 // Relay Outputs
 #define RELAY_STARLINK_PIN 16
diff --git a/firmware/esp32/xterra-controller/logger.cpp b/firmware/esp32/overland-controller/logger.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/logger.cpp
rename to firmware/esp32/overland-controller/logger.cpp
diff --git a/firmware/esp32/xterra-controller/logger.h b/firmware/esp32/overland-controller/logger.h
similarity index 100%
rename from firmware/esp32/xterra-controller/logger.h
rename to firmware/esp32/overland-controller/logger.h
diff --git a/firmware/esp32/xterra-controller/protocol.h b/firmware/esp32/overland-controller/protocol.h
similarity index 100%
rename from firmware/esp32/xterra-controller/protocol.h
rename to firmware/esp32/overland-controller/protocol.h
diff --git a/firmware/esp32/xterra-controller/relays.cpp b/firmware/esp32/overland-controller/relays.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/relays.cpp
rename to firmware/esp32/overland-controller/relays.cpp
diff --git a/firmware/esp32/xterra-controller/relays.h b/firmware/esp32/overland-controller/relays.h
similarity index 100%
rename from firmware/esp32/xterra-controller/relays.h
rename to firmware/esp32/overland-controller/relays.h
diff --git a/firmware/esp32/xterra-controller/sensors.cpp b/firmware/esp32/overland-controller/sensors.cpp
similarity index 100%
rename from firmware/esp32/xterra-controller/sensors.cpp
rename to firmware/esp32/overland-controller/sensors.cpp
diff --git a/firmware/esp32/xterra-controller/sensors.h b/firmware/esp32/overland-controller/sensors.h
similarity index 100%
rename from firmware/esp32/xterra-controller/sensors.h
rename to firmware/esp32/overland-controller/sensors.h
diff --git a/firmware/esp32/xterra-controller/system_status.h b/firmware/esp32/overland-controller/system_status.h
similarity index 51%
rename from firmware/esp32/xterra-controller/system_status.h
rename to firmware/esp32/overland-controller/system_status.h
index 8321dc5..5ad04dc 100644
--- a/firmware/esp32/xterra-controller/system_status.h
+++ b/firmware/esp32/overland-controller/system_status.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #define FIRMWARE_VERSION "0.3.0"
-#define FIRMWARE_NAME "xterra-controller"
+#define FIRMWARE_NAME "overland-controller"
diff --git a/firmware/esp32/xterra-controller/xterra-controller.ino b/firmware/esp32/overland-controller/xterra-controller.ino
similarity index 99%
rename from firmware/esp32/xterra-controller/xterra-controller.ino
rename to firmware/esp32/overland-controller/xterra-controller.ino
index cd73eeb..dc476b3 100644
--- a/firmware/esp32/xterra-controller/xterra-controller.ino
+++ b/firmware/esp32/overland-controller/xterra-controller.ino
@@ -705,7 +705,7 @@ void setup() {
 
     loadConfig();
     printConfig();
-    Serial.println("Xterra Controller Booting");
+    Serial.println("Overland Controller Booting");
     Serial.println("==================================");
 
     loadConfig();