diff --git a/targets/mpc85xx-generic b/targets/mpc85xx-generic
deleted file mode 100644
index a806587b4ad26d1a3272614108acaa7729f932a8..0000000000000000000000000000000000000000
--- a/targets/mpc85xx-generic
+++ /dev/null
@@ -1 +0,0 @@
-device('tp-link-tl-wdr4900-v1', 'tl-wdr4900-v1')
diff --git a/targets/mpc85xx-p1010 b/targets/mpc85xx-p1010
new file mode 100644
index 0000000000000000000000000000000000000000..3335ac599c4f7d84ed8a1c5e25392212e7ae13b4
--- /dev/null
+++ b/targets/mpc85xx-p1010
@@ -0,0 +1 @@
+device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1')
diff --git a/targets/mpc85xx-p1020 b/targets/mpc85xx-p1020
index 952b9998153ccd39de292c58d37a372e843d7549..b2887eb8956fcaad45a01fe2912fb70a168e8474 100644
--- a/targets/mpc85xx-p1020
+++ b/targets/mpc85xx-p1020
@@ -1,20 +1,20 @@
 -- Aerohive
 
-device('aerohive-hiveap-330', 'hiveap-330', {
+device('aerohive-hiveap-330', 'aerohive_hiveap-330', {
 	factory = false,
 })
 
 
 -- Enterasys
 
-device('enterasys-ws-ap3710i', 'ws-ap3710i', {
+device('enterasys-ws-ap3710i', 'enterasys_ws-ap3710i', {
 	factory = false,
 })
 
 
 -- OCEDO
 
-device('ocedo-panda', 'panda', {
+device('ocedo-panda', 'ocedo_panda', {
 	factory = false,
 })
 
diff --git a/targets/targets.mk b/targets/targets.mk
index a1fa1f2d4165b95022065c4e6f61167b56881528..956b66e3dbb5bbad2041e9466257b5b8f14cabb6 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -10,7 +10,7 @@ $(eval $(call GluonTarget,ipq40xx,generic))
 $(eval $(call GluonTarget,ipq806x,generic))
 $(eval $(call GluonTarget,lantiq,xrx200))
 $(eval $(call GluonTarget,lantiq,xway))
-$(eval $(call GluonTarget,mpc85xx,generic))
+$(eval $(call GluonTarget,mpc85xx,p1010))
 $(eval $(call GluonTarget,mpc85xx,p1020))
 $(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))