diff --git a/firmware/SOURCES b/firmware/SOURCES
index 45bedd9dbe..7e2d328c72 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -333,7 +333,7 @@ target/arm/crt0-pp.S
 #elif CONFIG_CPU == PNX0101
 target/arm/pnx0101/crt0-pnx0101.S
 #elif defined(OLYMPUS_MROBE_500)
-target/arm/olympus/mrobe-500/crt0.S
+target/arm/tms320dm320/mrobe-500/crt0.S
 #elif defined(CPU_ARM)
 target/arm/crt0.S
 #endif /* defined(CPU_*) */
@@ -622,18 +622,18 @@ target/arm/imx31/gigabeat-s/pcm-imx31.c
 
 #ifdef MROBE_500
 #ifndef SIMULATOR
-target/arm/olympus/mrobe-500/adc-mr500.c
-target/arm/olympus/mrobe-500/ata-mr500.c
-target/arm/olympus/mrobe-500/backlight-mr500.c
-target/arm/olympus/mrobe-500/button-mr500.c
-target/arm/olympus/mrobe-500/kernel-mr500.c
-target/arm/olympus/mrobe-500/lcd-mr500.c
-target/arm/olympus/mrobe-500/power-mr500.c
-target/arm/olympus/mrobe-500/system-mr500.c
-target/arm/olympus/mrobe-500/timer-mr500.c
-target/arm/olympus/mrobe-500/usb-mr500.c
-target/arm/olympus/mrobe-500/uart-mr500.c
-target/arm/olympus/mrobe-500/spi-mr500.c
+target/arm/tms320dm320/mrobe-500/adc-mr500.c
+target/arm/tms320dm320/mrobe-500/ata-mr500.c
+target/arm/tms320dm320/mrobe-500/backlight-mr500.c
+target/arm/tms320dm320/mrobe-500/button-mr500.c
+target/arm/tms320dm320/mrobe-500/kernel-mr500.c
+target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+target/arm/tms320dm320/mrobe-500/power-mr500.c
+target/arm/tms320dm320/mrobe-500/system-mr500.c
+target/arm/tms320dm320/mrobe-500/timer-mr500.c
+target/arm/tms320dm320/mrobe-500/usb-mr500.c
+target/arm/tms320dm320/mrobe-500/uart-mr500.c
+target/arm/tms320dm320/mrobe-500/spi-mr500.c
 #ifndef BOOTLOADER
 
 #endif
diff --git a/firmware/boot.lds b/firmware/boot.lds
index e3dbb49a8c..062370bf20 100644
--- a/firmware/boot.lds
+++ b/firmware/boot.lds
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
 #ifdef CPU_PP
 INPUT(target/arm/crt0-pp-bl.o)
 #elif defined(OLYMPUS_MROBE_500)
-INPUT(target/arm/olympus/mrobe-500/crt0.o)
+INPUT(target/arm/tms320dm320/mrobe-500/crt0.o)
 #else
 INPUT(target/arm/crt0.o)
 #endif
diff --git a/firmware/target/arm/olympus/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/adc-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/adc-target.h b/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/adc-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/adc-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/ata-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/ata-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/ata-target.h b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/ata-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/ata-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/backlight-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/backlight-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/backlight-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/backlight-target.h b/firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/backlight-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/backlight-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/button-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/button-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/button-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/crt0.S b/firmware/target/arm/tms320dm320/mrobe-500/crt0.S
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/crt0.S
rename to firmware/target/arm/tms320dm320/mrobe-500/crt0.S
diff --git a/firmware/target/arm/olympus/mrobe-500/kernel-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/kernel-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/kernel-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/kernel-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/lcd-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/lcd-target.h b/firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/lcd-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/lcd-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/power-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/spi-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/spi-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/spi-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/spi-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/spi-target.h b/firmware/target/arm/tms320dm320/mrobe-500/spi-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/spi-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/spi-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/system-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/system-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/system-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/system-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/system-target.h b/firmware/target/arm/tms320dm320/mrobe-500/system-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/system-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/system-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/timer-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/timer-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/timer-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/timer-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/timer-target.h b/firmware/target/arm/tms320dm320/mrobe-500/timer-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/timer-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/timer-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/uart-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/uart-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/uart-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/uart-mr500.c
diff --git a/firmware/target/arm/olympus/mrobe-500/uart-target.h b/firmware/target/arm/tms320dm320/mrobe-500/uart-target.h
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/uart-target.h
rename to firmware/target/arm/tms320dm320/mrobe-500/uart-target.h
diff --git a/firmware/target/arm/olympus/mrobe-500/usb-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
similarity index 100%
rename from firmware/target/arm/olympus/mrobe-500/usb-mr500.c
rename to firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
diff --git a/tools/configure b/tools/configure
index f5219f7a44..085c11092b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1301,7 +1301,7 @@ EOF
     bootoutput="rockbox.mrboot"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
-    t_manufacturer="olympus"
+    t_manufacturer="tms320dm320"
     t_model="mrobe-500"
     ;;