diff --git a/osm-garmin/app/build-gmap.sh b/osm-garmin/app/build-gmap.sh
index 4c82f2a..3fc8ffe 100755
--- a/osm-garmin/app/build-gmap.sh
+++ b/osm-garmin/app/build-gmap.sh
@@ -65,17 +65,16 @@ function build_gmap() {
         if [[ $build_failed == "false" ]]; then
             rm -f $generated_map_dir/*
             
-            mv "$build_dir/gmapsupp.img" "$generated_map_dir/"
-            mv "$build_dir/osmmap.img" "$generated_map_dir/"
-            mv "$build_dir/osmmap.tdb" "$generated_map_dir/"
+            mv "$build_dir/gmapsupp.img" "$generated_map_dir/${region_shortname}_gmapsupp.img"
+            mv "$build_dir/osmmap.img" "$generated_map_dir/${region_shortname}_osmmap.img"
+            mv "$build_dir/osmmap.tdb" "$generated_map_dir/${region_shortname}_osmmap.tdb"
             echo "$version" > "$version_path"
 
             rm -f $build_dir/*
+            rm -f "$styles_dir/x$style.TYP"
         else
             rm -f $build_dir/*
         fi
-
-        rm -f "$styles_dir/x$style.TYP"
     fi
 }