commit 50881ab55c8b704ad4230b44cf75055e79fd0b15
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Fri Jul 10 17:42:04 2015 +0200

    Fix #373 (1/2). Use coherent naming for precompiled images' filenames

diff --git a/targets.mk b/targets.mk
index c27fcf0..971a8ed 100644
--- a/targets.mk
+++ b/targets.mk
@@ -23,14 +23,14 @@ HW_AVAILABLE := ar71xx bullet kvm nsm2 nsm5 nsm5-xw nslm5-xw rocket-m-xw pico2 r
 TBUILD_LIST := openwrt
 
 ifeq ($(T),ar71xx)
-  NAME:=ar71xx
+  NAME:=Generic_ar71xx
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
 endif
 
 ifeq ($(T),alix)
-  NAME:=Alix
+  NAME:=PC-Engines_Alix
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=x86-qmp-big-node
@@ -39,7 +39,7 @@ ifeq ($(T),alix)
 endif
 
 ifeq ($(T),x86)
-  NAME:=x86
+  NAME:=Generic_x86
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=x86-qmp-big-node
@@ -48,7 +48,7 @@ ifeq ($(T),x86)
 endif
 
 ifeq ($(T),soekris45xx)
-  NAME:=SoekrisNet45xx
+  NAME:=Soekris_Net45xx
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=x86-qmp-big-node
@@ -57,7 +57,7 @@ ifeq ($(T),soekris45xx)
 endif
 
 ifeq ($(T),bullet)
-  NAME:=Bullet
+  NAME:=Ubiquiti_Bullet_M
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -75,7 +75,7 @@ ifeq ($(T),cf-wr800n)
 endif 
 
 ifeq ($(T),nsm2)
-  NAME:=NanoStationM2
+  NAME:=Ubiquiti_NanoStation_M2
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -84,7 +84,7 @@ ifeq ($(T),nsm2)
 endif
 
 ifeq ($(T),nsm5)
-  NAME:=NanoStationM5
+  NAME:=Ubiquiti_NanoStation_M5
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -93,7 +93,7 @@ ifeq ($(T),nsm5)
 endif
 
 ifeq ($(T),nsm5-xw)
-  NAME:=NanoStationM5-XW
+  NAME:=Ubiquiti_NanoStation_M5_XW
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -102,7 +102,7 @@ ifeq ($(T),nsm5-xw)
 endif
 
 ifeq ($(T),nslm5-xw)
-  NAME:=NanoStationLocoM5-XW
+  NAME:=Ubiquiti_NanoStation_Loco_M5_XW
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -111,7 +111,7 @@ ifeq ($(T),nslm5-xw)
 endif
 
 ifeq ($(T),rocket-m-xw)
-  NAME:=RocketM5-XW
+  NAME:=Ubiquiti_Rocket_M5_XW
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -120,7 +120,7 @@ ifeq ($(T),rocket-m-xw)
 endif
 
 ifeq ($(T),pico2)
-  NAME:=PicoStation2
+  NAME:=Ubiquiti_PicoStation_2
   ARCH:=ath25
   TBUILD:=openwrt
   PROFILE:=at2-qmp-tiny-node
@@ -129,7 +129,7 @@ ifeq ($(T),pico2)
 endif
 
 ifeq ($(T),rocket)
-  NAME:=Rocket
+  NAME:=Ubiquiti_Rocket_M
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -138,7 +138,7 @@ ifeq ($(T),rocket)
 endif
 
 ifeq ($(T),rs)
-  NAME:=RouterStation
+  NAME:=Ubiquiti_RouterStation
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-big-node
@@ -147,7 +147,7 @@ ifeq ($(T),rs)
 endif
 
 ifeq ($(T),rspro)
-  NAME:=RouterStationPro
+  NAME:=Ubiquiti_RouterStation_Pro
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-big-node
@@ -156,7 +156,7 @@ ifeq ($(T),rspro)
 endif
 
 ifeq ($(T),tl-2543)
-  NAME:=Tplink2543
+  NAME:=TP-Link_TL-WR2543ND-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -165,7 +165,7 @@ ifeq ($(T),tl-2543)
 endif
 
 ifeq ($(T),mc-mac1200r)
-  NAME:=MERCURY-MAC1200R
+  NAME:=Mercury_MAC1200R
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -174,7 +174,7 @@ ifeq ($(T),mc-mac1200r)
 endif
 
 ifeq ($(T),tl-wr841n-v7)
-  NAME:=TP-Link-TL-WR841N-v7
+  NAME:=TP-Link_TL-WR841N-v7
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -183,7 +183,7 @@ ifeq ($(T),tl-wr841n-v7)
 endif
 
 ifeq ($(T),tl-wr841n-v8)
-  NAME:=TP-Link-TL-WR841N-v8
+  NAME:=TP-Link_TL-WR841N-v8
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -192,7 +192,7 @@ ifeq ($(T),tl-wr841n-v8)
 endif
 
 ifeq ($(T),tl-wr841n-v9)
-  NAME:=TP-Link-TL-WR841N-v9
+  NAME:=TP-Link_TL-WR841N-v9
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -201,7 +201,7 @@ ifeq ($(T),tl-wr841n-v9)
 endif
 
 ifeq ($(T),tl-842)
-  NAME:=Tplink842
+  NAME:=TP-Link_TL-WR842ND-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -210,7 +210,7 @@ ifeq ($(T),tl-842)
 endif
 
 ifeq ($(T),tl-703n)
-  NAME:=Tplink703n
+  NAME:=TP-Link_TL-WR703N-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -220,7 +220,7 @@ endif
 
 
 ifeq ($(T),tl-mr3020)
-  NAME:=TplinkMR3020
+  NAME:=TP-Link_TL-MR3020-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -229,7 +229,7 @@ ifeq ($(T),tl-mr3020)
 endif
 
 ifeq ($(T),tl-mr3040)
-  NAME:=TplinkMR3040
+  NAME:=TP-Link_TL-MR3040-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -256,7 +256,7 @@ ifeq ($(T),tl-mr3040-bmx6dev)
 endif 
 
 ifeq ($(T),tl-wdr3600)
-  NAME:=TplinkWDR3600
+  NAME:=TP-Link_TL-WDR3600-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-big-node
@@ -265,7 +265,7 @@ ifeq ($(T),tl-wdr3600)
 endif
 
 ifeq ($(T),tl-wdr4300)
-  NAME:=TplinkWDR4300
+  NAME:=TP-Link_TL-WDR4300-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-big-node
@@ -274,7 +274,7 @@ ifeq ($(T),tl-wdr4300)
 endif
 
 ifeq ($(T),tl-wdr4900-v1)
-  NAME:=TP-Link-TL-WDR4900-v1
+  NAME:=TP-Link_TL-WDR4900-v1
   ARCH:=mpc85xx
   TBUILD:=openwrt
   IMAGE:=bin/$(ARCH)/openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-factory.bin
@@ -282,7 +282,7 @@ ifeq ($(T),tl-wdr4900-v1)
 endif
 
 ifeq ($(T),tl-wr743nd)
-  NAME:=Tplink743nd
+  NAME:=TP-Link_TL-WR743ND-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -291,7 +291,7 @@ ifeq ($(T),tl-wr743nd)
 endif
 
 ifeq ($(T),tl-wr740n)
-  NAME:=Tplink740n
+  NAME:=TP-Link_TL-WR740N-v1
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-tiny-node
@@ -300,7 +300,7 @@ ifeq ($(T),tl-wr740n)
 endif
 
 ifeq ($(T),wpe72)
-  NAME:=CompexWPE72
+  NAME:=Compex_WPE72
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -308,7 +308,7 @@ ifeq ($(T),wpe72)
 endif
 
 ifeq ($(T),dragino2)
-  NAME:=Dragino2
+  NAME:=Dragino_MS14
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -317,7 +317,7 @@ ifeq ($(T),dragino2)
 endif
 
 ifeq ($(T),unifi-ap)
-  NAME:=Ubiquiti-UniFi-AP
+  NAME:=Ubiquiti_UniFi_AP
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -326,7 +326,7 @@ ifeq ($(T),unifi-ap)
 endif
 
 ifeq ($(T),uap-pro)
-  NAME:=Ubiquiti-UniFi-AP-PRO
+  NAME:=Ubiquiti_UniFi_AP-PRO
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ath-qmp-small-node
@@ -335,7 +335,7 @@ ifeq ($(T),uap-pro)
 endif
 
 ifeq ($(T),vbox)
-  NAME:=VBox
+  NAME:=VirtualBox_x86
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=vm-qmp-big-node
@@ -343,7 +343,7 @@ ifeq ($(T),vbox)
 endif
 
 ifeq ($(T),vmware)
-  NAME:=VMware
+  NAME:=VMware_x86
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=vm-qmp-big-node
@@ -368,7 +368,7 @@ ifeq ($(T),wrtnode)
 endif 
 
 ifeq ($(T),wt1520-4m)
-  NAME:=Nexx-WT1520-4M
+  NAME:=Nexx_WT1520-4M
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=rt5350-qmp-tiny-node
@@ -377,7 +377,7 @@ ifeq ($(T),wt1520-4m)
 endif
 
 ifeq ($(T),wt1520-8m)
-  NAME:=Nexx-WT1520-8M
+  NAME:=Nexx_WT1520-8M
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=rt5350-qmp-small-node
@@ -386,7 +386,7 @@ ifeq ($(T),wt1520-8m)
 endif
 
 ifeq ($(T),wt3020-4m)
-  NAME:=Nexx-WT3020-4M
+  NAME:=Nexx_WT3020-4M
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=mt7620_kstrip-qmp-tiny-node
@@ -395,7 +395,7 @@ ifeq ($(T),wt3020-4m)
 endif
 
 ifeq ($(T),wt3020-8m)
-  NAME:=Nexx-WT3020-8M
+  NAME:=Nexx_WT3020-8M
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=mt7620-qmp-small-node
@@ -404,7 +404,7 @@ ifeq ($(T),wt3020-8m)
 endif
 
 ifeq ($(T),xiaomi-miwifi-mini)
-  NAME:=Xiaomi-MiWiFi-Mini
+  NAME:=Xiaomi_MiWiFi-Mini
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=mt7620-qmp-small-node
@@ -413,7 +413,7 @@ ifeq ($(T),xiaomi-miwifi-mini)
 endif 
 
 ifeq ($(T),dir-810l)
-  NAME:=D-Link-DIR-810L
+  NAME:=D-Link_DIR-810L
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=mt7620-qmp-small-node
@@ -421,7 +421,7 @@ ifeq ($(T),dir-810l)
 endif 
 
 ifeq ($(T),kvm)
-  NAME:=KVM
+  NAME:=KVM_x86
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=kvm-qmp-big-node
@@ -429,7 +429,7 @@ ifeq ($(T),kvm)
 endif
 
 ifeq ($(T),ar71xx-ib)
-  NAME:=ar71xx
+  NAME:=ar71xx_imagebuilder
   ARCH:=ar71xx
   TBUILD:=openwrt
   PROFILE:=ar71xx-imagebuilder
@@ -438,7 +438,7 @@ ifeq ($(T),ar71xx-ib)
 endif
 
 ifeq ($(T),ath25-ib)
-  NAME:=ath25
+  NAME:=ath25_imagebuilder
   ARCH:=ath25
   TBUILD:=openwrt
   PROFILE:=ath25-imagebuilder
@@ -447,7 +447,7 @@ ifeq ($(T),ath25-ib)
 endif
 
 ifeq ($(T),mpc85xx-ib)
-  NAME:=mpc85xx
+  NAME:=mpc85xx_imagebuilder
   ARCH:=mpc85xx
   TBUILD:=openwrt
   PROFILE:=mpc85xx-imagebuilder
@@ -456,7 +456,7 @@ ifeq ($(T),mpc85xx-ib)
 endif
 
 ifeq ($(T),ramips-ib)
-  NAME:=ramips
+  NAME:=ramips_imagebuilder
   ARCH:=ramips
   TBUILD:=openwrt
   PROFILE:=ramips-imagebuilder
@@ -465,7 +465,7 @@ ifeq ($(T),ramips-ib)
 endif
 
 ifeq ($(T),x86-ib)
-  NAME:=x86
+  NAME:=x86_imagebuilder
   ARCH:=x86
   TBUILD:=openwrt
   PROFILE:=x86-imagebuilder