diff --git a/Makefile b/Makefile
index 3cea9c365..c175ccd40 100644
--- a/Makefile
+++ b/Makefile
@@ -198,12 +198,12 @@ export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
 export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics
 
 # Define supported board lists
-ALL_BOARDS    := coptercontrol oplink revolution revomini osd simposix
-ALL_BOARDS_BU := coptercontrol oplink simposix
+ALL_BOARDS    := coptercontrol oplinkmini revolution revomini osd simposix
+ALL_BOARDS_BU := coptercontrol oplinkmini simposix
 
 # Friendly names of each board (used to find source tree)
 coptercontrol_friendly := CopterControl
-oplink_friendly        := OPLink
+oplinkmini_friendly    := OPLinkMini
 revolution_friendly    := Revolution
 revomini_friendly      := RevoMini
 osd_friendly           := OSD
@@ -211,7 +211,7 @@ simposix_friendly      := SimPosix
 
 # Short names of each board (used to display board name in parallel builds)
 coptercontrol_short    := 'cc  '
-oplink_short           := 'opl'
+oplinkmini_short       := 'oplm'
 revolution_short       := 'revo'
 revomini_short         := 'rm  '
 osd_short              := 'osd '
diff --git a/flight/PiOS/Boards/STM32103CB_OPLink_Rev1.h b/flight/PiOS/Boards/STM32103CB_OPLinkMini_Rev1.h
old mode 100755
new mode 100644
similarity index 98%
rename from flight/PiOS/Boards/STM32103CB_OPLink_Rev1.h
rename to flight/PiOS/Boards/STM32103CB_OPLinkMini_Rev1.h
index b58a12345..dcbfbcc9d
--- a/flight/PiOS/Boards/STM32103CB_OPLink_Rev1.h
+++ b/flight/PiOS/Boards/STM32103CB_OPLinkMini_Rev1.h
@@ -23,8 +23,8 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef STM32103CB_OPLINK_H_
-#define STM32103CB_OPLINK_H_
+#ifndef STM32103CB_OPLINKMINI_H
+#define STM32103CB_OPLINKMINI_H
 
 #define ADD_ONE_ADC
 
@@ -312,4 +312,4 @@ extern uint32_t pios_packet_handler;
 #define PIOS_FLASH_EEPROM_ADDR (PIOS_FLASH_EEPROM_START_ADDR + PIOS_FLASH_SIZE - PIOS_FLASH_PAGE_SIZE)
 #define PIOS_FLASH_EEPROM_LEN PIOS_FLASH_PAGE_SIZE
 
-#endif /* STM32103CB_OPLINK_H_ */
+#endif /* STM32103CB_OPLINKMINI_H */
diff --git a/flight/PiOS/Boards/pios_board.h b/flight/PiOS/Boards/pios_board.h
index eb49907b7..87e227060 100644
--- a/flight/PiOS/Boards/pios_board.h
+++ b/flight/PiOS/Boards/pios_board.h
@@ -3,8 +3,8 @@
 
 #ifdef USE_STM3210E_OP
 #include "STM3210E_OP.h"
-#elif USE_STM32103CB_OPLINK
-#include "STM32103CB_OPLink_Rev1.h"
+#elif USE_STM32103CB_OPLINKMINI
+#include "STM32103CB_OPLinkMini_Rev1.h"
 #elif USE_STM32103CB_CC_Rev1
 #include "STM32103CB_CC_Rev1.h"
 #elif USE_STM32F2xx_INS
diff --git a/flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_BL_sections.ld b/flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_BL_sections.ld
similarity index 100%
rename from flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_BL_sections.ld
rename to flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_BL_sections.ld
diff --git a/flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_memory.ld b/flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_memory.ld
similarity index 100%
rename from flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_memory.ld
rename to flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_memory.ld
diff --git a/flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_sections.ld b/flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_sections.ld
similarity index 100%
rename from flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_sections.ld
rename to flight/PiOS/STM32F10x/link_STM32103CB_OPLINKMINI_sections.ld
diff --git a/flight/Project/gdb/oplink b/flight/Project/gdb/oplinkmini
similarity index 92%
rename from flight/Project/gdb/oplink
rename to flight/Project/gdb/oplinkmini
index a04095a20..b64ce2a35 100644
--- a/flight/Project/gdb/oplink
+++ b/flight/Project/gdb/oplinkmini
@@ -1,7 +1,7 @@
 define connect
 	target remote localhost:3333
 	monitor cortex_m3 vector_catch all
-	file ./Build/OPLink.elf
+	file ./build/fw_oplinkmini/fw_oplinkmini.elf
 end
 #monitor reset halt
 
diff --git a/flight/targets/Bootloaders/OPLink/Makefile b/flight/targets/Bootloaders/OPLinkMini/Makefile
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/Makefile
rename to flight/targets/Bootloaders/OPLinkMini/Makefile
diff --git a/flight/targets/Bootloaders/OPLink/inc/common.h b/flight/targets/Bootloaders/OPLinkMini/inc/common.h
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/inc/common.h
rename to flight/targets/Bootloaders/OPLinkMini/inc/common.h
diff --git a/flight/targets/Bootloaders/OPLink/inc/op_dfu.h b/flight/targets/Bootloaders/OPLinkMini/inc/op_dfu.h
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/inc/op_dfu.h
rename to flight/targets/Bootloaders/OPLinkMini/inc/op_dfu.h
diff --git a/flight/targets/Bootloaders/OPLink/inc/pios_config.h b/flight/targets/Bootloaders/OPLinkMini/inc/pios_config.h
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/inc/pios_config.h
rename to flight/targets/Bootloaders/OPLinkMini/inc/pios_config.h
diff --git a/flight/targets/Bootloaders/OPLink/inc/pios_usb_board_data.h b/flight/targets/Bootloaders/OPLinkMini/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/inc/pios_usb_board_data.h
rename to flight/targets/Bootloaders/OPLinkMini/inc/pios_usb_board_data.h
diff --git a/flight/targets/Bootloaders/OPLink/main.c b/flight/targets/Bootloaders/OPLinkMini/main.c
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/main.c
rename to flight/targets/Bootloaders/OPLinkMini/main.c
diff --git a/flight/targets/Bootloaders/OPLink/op_dfu.c b/flight/targets/Bootloaders/OPLinkMini/op_dfu.c
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/op_dfu.c
rename to flight/targets/Bootloaders/OPLinkMini/op_dfu.c
diff --git a/flight/targets/Bootloaders/OPLink/pios_board.c b/flight/targets/Bootloaders/OPLinkMini/pios_board.c
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/pios_board.c
rename to flight/targets/Bootloaders/OPLinkMini/pios_board.c
diff --git a/flight/targets/Bootloaders/OPLink/pios_usb_board_data.c b/flight/targets/Bootloaders/OPLinkMini/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/Bootloaders/OPLink/pios_usb_board_data.c
rename to flight/targets/Bootloaders/OPLinkMini/pios_usb_board_data.c
diff --git a/flight/targets/OPLink/Makefile b/flight/targets/OPLinkMini/Makefile
similarity index 100%
rename from flight/targets/OPLink/Makefile
rename to flight/targets/OPLinkMini/Makefile
diff --git a/flight/targets/OPLink/System/inc/FreeRTOSConfig.h b/flight/targets/OPLinkMini/System/inc/FreeRTOSConfig.h
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/inc/FreeRTOSConfig.h
rename to flight/targets/OPLinkMini/System/inc/FreeRTOSConfig.h
diff --git a/flight/targets/OPLink/System/inc/openpilot.h b/flight/targets/OPLinkMini/System/inc/openpilot.h
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/inc/openpilot.h
rename to flight/targets/OPLinkMini/System/inc/openpilot.h
diff --git a/flight/targets/OPLink/System/inc/pios_board_posix.h b/flight/targets/OPLinkMini/System/inc/pios_board_posix.h
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/inc/pios_board_posix.h
rename to flight/targets/OPLinkMini/System/inc/pios_board_posix.h
diff --git a/flight/targets/OPLink/System/inc/pios_config.h b/flight/targets/OPLinkMini/System/inc/pios_config.h
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/inc/pios_config.h
rename to flight/targets/OPLinkMini/System/inc/pios_config.h
diff --git a/flight/targets/OPLink/System/inc/pios_config_posix.h b/flight/targets/OPLinkMini/System/inc/pios_config_posix.h
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/inc/pios_config_posix.h
rename to flight/targets/OPLinkMini/System/inc/pios_config_posix.h
diff --git a/flight/targets/OPLink/System/inc/pios_usb_board_data.h b/flight/targets/OPLinkMini/System/inc/pios_usb_board_data.h
similarity index 100%
rename from flight/targets/OPLink/System/inc/pios_usb_board_data.h
rename to flight/targets/OPLinkMini/System/inc/pios_usb_board_data.h
diff --git a/flight/targets/OPLink/System/oplink.c b/flight/targets/OPLinkMini/System/oplink.c
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/oplink.c
rename to flight/targets/OPLinkMini/System/oplink.c
diff --git a/flight/targets/OPLink/System/pios_board.c b/flight/targets/OPLinkMini/System/pios_board.c
similarity index 100%
rename from flight/targets/OPLink/System/pios_board.c
rename to flight/targets/OPLinkMini/System/pios_board.c
diff --git a/flight/targets/OPLink/System/pios_board_posix.c b/flight/targets/OPLinkMini/System/pios_board_posix.c
old mode 100755
new mode 100644
similarity index 100%
rename from flight/targets/OPLink/System/pios_board_posix.c
rename to flight/targets/OPLinkMini/System/pios_board_posix.c
diff --git a/flight/targets/OPLink/System/pios_usb_board_data.c b/flight/targets/OPLinkMini/System/pios_usb_board_data.c
similarity index 100%
rename from flight/targets/OPLink/System/pios_usb_board_data.c
rename to flight/targets/OPLinkMini/System/pios_usb_board_data.c
diff --git a/flight/targets/board_hw_defs/oplink/board_hw_defs.c b/flight/targets/board_hw_defs/oplinkmini/board_hw_defs.c
similarity index 100%
rename from flight/targets/board_hw_defs/oplink/board_hw_defs.c
rename to flight/targets/board_hw_defs/oplinkmini/board_hw_defs.c
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index 1be9aa1ec..bcaed2265 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -565,7 +565,7 @@ bool UploaderGadgetWidget::autoUpdate()
     emit autoUpdateSignal(LOADING_FW,QVariant());
     switch (dfu->devices[0].ID) {
     case 0x301:
-        filename = "fw_pipxtreme";
+        filename = "fw_oplinkmini";
         break;
     case 0x401:
     case 0x402:
diff --git a/make/boards/oplink/board-info.mk b/make/boards/oplinkmini/board-info.mk
similarity index 95%
rename from make/boards/oplink/board-info.mk
rename to make/boards/oplinkmini/board-info.mk
index fa1d627a3..28dd7641e 100644
--- a/make/boards/oplink/board-info.mk
+++ b/make/boards/oplinkmini/board-info.mk
@@ -5,7 +5,7 @@ HW_TYPE             := 0x01
 
 MCU                 := cortex-m3
 CHIP                := STM32F103CBT
-BOARD               := STM32103CB_OPLINK
+BOARD               := STM32103CB_OPLINKMINI
 MODEL               := MD
 MODEL_SUFFIX        := _PX