diff --git a/target/linux/cavium-octeon/Makefile b/target/linux/octeon/Makefile
similarity index 96%
rename from target/linux/cavium-octeon/Makefile
rename to target/linux/octeon/Makefile
index 7968a10ed..3cf814866 100644
--- a/target/linux/cavium-octeon/Makefile
+++ b/target/linux/octeon/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=mips
-BOARD:=cavium-octeon
+BOARD:=octeon
 BOARDNAME:=Cavium Networks Octeon
 FEATURES:=squashfs jffs2 pci
 CFLAGS:=-Os -pipe -funit-at-a-time
diff --git a/target/linux/cavium-octeon/base-files/etc/config/network b/target/linux/octeon/base-files/etc/config/network
similarity index 100%
rename from target/linux/cavium-octeon/base-files/etc/config/network
rename to target/linux/octeon/base-files/etc/config/network
diff --git a/target/linux/cavium-octeon/config-default b/target/linux/octeon/config-default
similarity index 100%
rename from target/linux/cavium-octeon/config-default
rename to target/linux/octeon/config-default
diff --git a/target/linux/cavium-octeon/config/profile-mototech b/target/linux/octeon/config/profile-mototech
similarity index 100%
rename from target/linux/cavium-octeon/config/profile-mototech
rename to target/linux/octeon/config/profile-mototech
diff --git a/target/linux/cavium-octeon/config/profile-simulator b/target/linux/octeon/config/profile-simulator
similarity index 100%
rename from target/linux/cavium-octeon/config/profile-simulator
rename to target/linux/octeon/config/profile-simulator
diff --git a/target/linux/cavium-octeon/image/Makefile b/target/linux/octeon/image/Makefile
similarity index 100%
rename from target/linux/cavium-octeon/image/Makefile
rename to target/linux/octeon/image/Makefile
diff --git a/target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/001-handle_removal_h_constraint.patch
rename to target/linux/octeon/patches/001-handle_removal_h_constraint.patch
diff --git a/target/linux/cavium-octeon/patches/002-register_defs_pci.patch b/target/linux/octeon/patches/002-register_defs_pci.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/002-register_defs_pci.patch
rename to target/linux/octeon/patches/002-register_defs_pci.patch
diff --git a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch b/target/linux/octeon/patches/003_pci_pcie_support.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
rename to target/linux/octeon/patches/003_pci_pcie_support.patch
diff --git a/target/linux/cavium-octeon/patches/004-named_alloc_function.patch b/target/linux/octeon/patches/004-named_alloc_function.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/004-named_alloc_function.patch
rename to target/linux/octeon/patches/004-named_alloc_function.patch
diff --git a/target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch b/target/linux/octeon/patches/005-register_defs_octeon_mgmt.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/005-register_defs_octeon_mgmt.patch
rename to target/linux/octeon/patches/005-register_defs_octeon_mgmt.patch
diff --git a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch b/target/linux/octeon/patches/006-octeon_mgmt_driver.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
rename to target/linux/octeon/patches/006-octeon_mgmt_driver.patch
diff --git a/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch b/target/linux/octeon/patches/007-export_cvmx_sysinfo.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
rename to target/linux/octeon/patches/007-export_cvmx_sysinfo.patch
diff --git a/target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch b/target/linux/octeon/patches/008-more_board_types_constraints.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/008-more_board_types_constraints.patch
rename to target/linux/octeon/patches/008-more_board_types_constraints.patch
diff --git a/target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch b/target/linux/octeon/patches/009-more_chip_specific_feature_tests.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/009-more_chip_specific_feature_tests.patch
rename to target/linux/octeon/patches/009-more_chip_specific_feature_tests.patch
diff --git a/target/linux/cavium-octeon/patches/010-export_erratum_function.patch b/target/linux/octeon/patches/010-export_erratum_function.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/010-export_erratum_function.patch
rename to target/linux/octeon/patches/010-export_erratum_function.patch
diff --git a/target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch b/target/linux/octeon/patches/011-octeon_ethernet_driver.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/011-octeon_ethernet_driver.patch
rename to target/linux/octeon/patches/011-octeon_ethernet_driver.patch
diff --git a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch b/target/linux/octeon/patches/012-hook_up_eth_driver.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
rename to target/linux/octeon/patches/012-hook_up_eth_driver.patch
diff --git a/target/linux/cavium-octeon/patches/013-compile_fixes.patch b/target/linux/octeon/patches/013-compile_fixes.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/013-compile_fixes.patch
rename to target/linux/octeon/patches/013-compile_fixes.patch
diff --git a/target/linux/cavium-octeon/patches/015-no_werror.patch b/target/linux/octeon/patches/015-no_werror.patch
similarity index 100%
rename from target/linux/cavium-octeon/patches/015-no_werror.patch
rename to target/linux/octeon/patches/015-no_werror.patch
diff --git a/target/linux/cavium-octeon/profiles/100-Mototech.mk b/target/linux/octeon/profiles/100-Mototech.mk
similarity index 100%
rename from target/linux/cavium-octeon/profiles/100-Mototech.mk
rename to target/linux/octeon/profiles/100-Mototech.mk
diff --git a/target/linux/cavium-octeon/profiles/200-Simulator.mk b/target/linux/octeon/profiles/200-Simulator.mk
similarity index 100%
rename from target/linux/cavium-octeon/profiles/200-Simulator.mk
rename to target/linux/octeon/profiles/200-Simulator.mk