diff --git a/scripts/images/rpi-hypriot/.dockerignore b/scripts/images/raspberry-pi-hypriot/.dockerignore
similarity index 100%
rename from scripts/images/rpi-hypriot/.dockerignore
rename to scripts/images/raspberry-pi-hypriot/.dockerignore
diff --git a/scripts/images/rpi-hypriot/.gitignore b/scripts/images/raspberry-pi-hypriot/.gitignore
similarity index 100%
rename from scripts/images/rpi-hypriot/.gitignore
rename to scripts/images/raspberry-pi-hypriot/.gitignore
diff --git a/scripts/images/rpi-hypriot/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
similarity index 100%
rename from scripts/images/rpi-hypriot/Dockerfile.dapper
rename to scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
diff --git a/scripts/images/rpi-hypriot/README.md b/scripts/images/raspberry-pi-hypriot/README.md
similarity index 100%
rename from scripts/images/rpi-hypriot/README.md
rename to scripts/images/raspberry-pi-hypriot/README.md
diff --git a/scripts/images/rpi-hypriot/scripts/build.sh b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
similarity index 96%
rename from scripts/images/rpi-hypriot/scripts/build.sh
rename to scripts/images/raspberry-pi-hypriot/scripts/build.sh
index 1c76a380..ef61d043 100755
--- a/scripts/images/rpi-hypriot/scripts/build.sh
+++ b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
@@ -71,8 +71,8 @@ umount build/root/boot
 umount build/root
 
 # package, compress and export image file
-mv build/run.img build/rancheros-rpi2.img
-zip dist/rancheros-rpi2.zip build/rancheros-rpi2.img
+mv build/run.img build/rancheros-raspberry-pi.img
+zip dist/rancheros-raspberry-pi.zip build/rancheros-raspberry-pi.img
 ls -alh dist
 
 # cleanup build environment