diff --git a/tests/images/dj596.img b/tests/images/Alinco_DJ596.img
similarity index 100%
rename from tests/images/dj596.img
rename to tests/images/Alinco_DJ596.img
diff --git a/tests/images/dr235.img b/tests/images/Alinco_DR235T.img
similarity index 100%
rename from tests/images/dr235.img
rename to tests/images/Alinco_DR235T.img
diff --git a/tests/images/uv3r.img b/tests/images/Baofeng_UV-3R.img
similarity index 100%
rename from tests/images/uv3r.img
rename to tests/images/Baofeng_UV-3R.img
diff --git a/tests/images/ic2100.img b/tests/images/Icom_IC-2100H.img
similarity index 100%
rename from tests/images/ic2100.img
rename to tests/images/Icom_IC-2100H.img
diff --git a/tests/images/ic2200.img b/tests/images/Icom_IC-2200H.img
similarity index 100%
rename from tests/images/ic2200.img
rename to tests/images/Icom_IC-2200H.img
diff --git a/tests/images/ic2720.img b/tests/images/Icom_IC-2720H.img
similarity index 100%
rename from tests/images/ic2720.img
rename to tests/images/Icom_IC-2720H.img
diff --git a/tests/images/ic2820.img b/tests/images/Icom_IC-2820H.img
similarity index 100%
rename from tests/images/ic2820.img
rename to tests/images/Icom_IC-2820H.img
diff --git a/tests/images/icq7.img b/tests/images/Icom_IC-Q7A.img
similarity index 100%
rename from tests/images/icq7.img
rename to tests/images/Icom_IC-Q7A.img
diff --git a/tests/images/ict70.img b/tests/images/Icom_IC-T70.img
similarity index 100%
rename from tests/images/ict70.img
rename to tests/images/Icom_IC-T70.img
diff --git a/tests/images/icx8x.img b/tests/images/Icom_IC-V82_U82.img
similarity index 100%
rename from tests/images/icx8x.img
rename to tests/images/Icom_IC-V82_U82.img
diff --git a/tests/images/icw32.img b/tests/images/Icom_IC-W32A.img
similarity index 100%
rename from tests/images/icw32.img
rename to tests/images/Icom_IC-W32A.img
diff --git a/tests/images/id800.img b/tests/images/Icom_ID-800H_v2.img
similarity index 100%
rename from tests/images/id800.img
rename to tests/images/Icom_ID-800H_v2.img
diff --git a/tests/images/id880.img b/tests/images/Icom_ID-880H.img
similarity index 100%
rename from tests/images/id880.img
rename to tests/images/Icom_ID-880H.img
diff --git a/tests/images/jt220m.img b/tests/images/Jetstream_JT220M.img
similarity index 100%
rename from tests/images/jt220m.img
rename to tests/images/Jetstream_JT220M.img
diff --git a/tests/images/px2r.img b/tests/images/Puxing_PX-2R.img
similarity index 100%
rename from tests/images/px2r.img
rename to tests/images/Puxing_PX-2R.img
diff --git a/tests/images/px777.img b/tests/images/Puxing_PX-777.img
similarity index 100%
rename from tests/images/px777.img
rename to tests/images/Puxing_PX-777.img
diff --git a/tests/images/kguvd1p.img b/tests/images/Wouxun_KG-UVD1P.img
similarity index 100%
rename from tests/images/kguvd1p.img
rename to tests/images/Wouxun_KG-UVD1P.img
diff --git a/tests/images/ft2800.img b/tests/images/Yaesu_FT-2800M.img
similarity index 100%
rename from tests/images/ft2800.img
rename to tests/images/Yaesu_FT-2800M.img
diff --git a/tests/images/ft60.img b/tests/images/Yaesu_FT-60.img
similarity index 100%
rename from tests/images/ft60.img
rename to tests/images/Yaesu_FT-60.img
diff --git a/tests/images/ft7800.img b/tests/images/Yaesu_FT-7800.img
similarity index 100%
rename from tests/images/ft7800.img
rename to tests/images/Yaesu_FT-7800.img
diff --git a/tests/images/ft817.img b/tests/images/Yaesu_FT-817.img
similarity index 100%
rename from tests/images/ft817.img
rename to tests/images/Yaesu_FT-817.img
diff --git a/tests/images/ft817nd.img b/tests/images/Yaesu_FT-817ND_Intl_versions.img
similarity index 100%
rename from tests/images/ft817nd.img
rename to tests/images/Yaesu_FT-817ND_Intl_versions.img
diff --git a/tests/images/ft817nd-us.img b/tests/images/Yaesu_FT-817ND_US_Version.img
similarity index 100%
rename from tests/images/ft817nd-us.img
rename to tests/images/Yaesu_FT-817ND_US_Version.img
diff --git a/tests/images/ft857.img b/tests/images/Yaesu_FT-857.img
similarity index 100%
rename from tests/images/ft857.img
rename to tests/images/Yaesu_FT-857.img
diff --git a/tests/images/ft857-us.img b/tests/images/Yaesu_FT-857_US_Version.img
similarity index 100%
rename from tests/images/ft857-us.img
rename to tests/images/Yaesu_FT-857_US_Version.img
diff --git a/tests/images/ft8800.img b/tests/images/Yaesu_FT-8800.img
similarity index 100%
rename from tests/images/ft8800.img
rename to tests/images/Yaesu_FT-8800.img
diff --git a/tests/images/ft8900.img b/tests/images/Yaesu_FT-8900.img
similarity index 100%
rename from tests/images/ft8900.img
rename to tests/images/Yaesu_FT-8900.img
diff --git a/tests/images/vx3.img b/tests/images/Yaesu_VX-3.img
similarity index 100%
rename from tests/images/vx3.img
rename to tests/images/Yaesu_VX-3.img
diff --git a/tests/images/vx5.img b/tests/images/Yaesu_VX-5.img
similarity index 100%
rename from tests/images/vx5.img
rename to tests/images/Yaesu_VX-5.img
diff --git a/tests/images/vx6.img b/tests/images/Yaesu_VX-6.img
similarity index 100%
rename from tests/images/vx6.img
rename to tests/images/Yaesu_VX-6.img
diff --git a/tests/images/vx7.img b/tests/images/Yaesu_VX-7.img
similarity index 100%
rename from tests/images/vx7.img
rename to tests/images/Yaesu_VX-7.img
diff --git a/tests/images/vx8.img b/tests/images/Yaesu_VX-8_R.img
similarity index 100%
rename from tests/images/vx8.img
rename to tests/images/Yaesu_VX-8_R.img