diff --git a/x-kiosk-imx8/Dockerfile b/xkiosk-imx8/Dockerfile
similarity index 97%
rename from x-kiosk-imx8/Dockerfile
rename to xkiosk-imx8/Dockerfile
index 386e710..8939027 100644
--- a/x-kiosk-imx8/Dockerfile
+++ b/xkiosk-imx8/Dockerfile
@@ -14,11 +14,11 @@
 #
 
 # For testing in the LmP
-# docker build --tag hub.foundries.io/lmp/x-kiosk-imx8:latest .
-# docker run -it --rm --device-cgroup-rule='c 199:* rmw' --device-cgroup-rule='c 226:* rmw' -v /run/user/63:/run/user/63 -v /dev/dri:/dev/dri -v /dev/galcore:/dev/galcore --entrypoint /bin/bash hub.foundries.io/lmp/x-kiosk-imx8:latest
+# docker build --tag hub.foundries.io/lmp/xkiosk-imx8:latest .
+# docker run -it --rm --device-cgroup-rule='c 199:* rmw' --device-cgroup-rule='c 226:* rmw' -v /run/user/63:/run/user/63 -v /dev/dri:/dev/dri -v /dev/galcore:/dev/galcore --entrypoint /bin/bash hub.foundries.io/lmp/xkiosk-imx8:latest
 # /start.sh
 # or
-# docker run -it --rm --device-cgroup-rule='c 199:* rmw' --device-cgroup-rule='c 226:* rmw' -v /run/user/63:/run/user/63 -v /dev/dri:/dev/dri -v /dev/galcore:/dev/galcore hub.foundries.io/lmp/x-kiosk-imx8:latest
+# docker run -it --rm --device-cgroup-rule='c 199:* rmw' --device-cgroup-rule='c 226:* rmw' -v /run/user/63:/run/user/63 -v /dev/dri:/dev/dri -v /dev/galcore:/dev/galcore hub.foundries.io/lmp/xkiosk-imx8:latest
 FROM hub.foundries.io/lmp/0chromium-imx8-aarch64 AS build
 
 FROM hub.foundries.io/lmp/0debian-base-imx8-aarch64
diff --git a/x-kiosk-imx8/docker-build.conf b/xkiosk-imx8/docker-build.conf
similarity index 100%
rename from x-kiosk-imx8/docker-build.conf
rename to xkiosk-imx8/docker-build.conf
diff --git a/x-kiosk-imx8/docker-compose.yml b/xkiosk-imx8/docker-compose.yml
similarity index 86%
rename from x-kiosk-imx8/docker-compose.yml
rename to xkiosk-imx8/docker-compose.yml
index 6508c27..2dadf6e 100644
--- a/x-kiosk-imx8/docker-compose.yml
+++ b/xkiosk-imx8/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3.6'
 
 services:
-  x-kiosk-imx8:
-    image: hub.foundries.io/lmp/x-kiosk-imx8:latest
+  xkiosk-imx8:
+    image: hub.foundries.io/lmp/xkiosk-imx8:latest
     restart: always
     tty: true
     command: "${ADDR-www.foundries.io}"
diff --git a/x-kiosk-imx8/start.sh b/xkiosk-imx8/start.sh
similarity index 100%
rename from x-kiosk-imx8/start.sh
rename to xkiosk-imx8/start.sh
diff --git a/x-kiosk/Dockerfile b/xkiosk/Dockerfile
similarity index 90%
rename from x-kiosk/Dockerfile
rename to xkiosk/Dockerfile
index 1aced1e..1cebe67 100644
--- a/x-kiosk/Dockerfile
+++ b/xkiosk/Dockerfile
@@ -14,8 +14,8 @@
 #
 
 # For testing in the LmP
-# docker build --tag hub.foundries.io/lmp/x-kiosk:latest .
-# docker run -it --user 63:63 --rm -v /tmp/.X11-unix:/tmp/.X11-unix hub.foundries.io/lmp/x-kiosk:latest www.foundries.io
+# docker build --tag hub.foundries.io/lmp/xkiosk:latest .
+# docker run -it --user 63:63 --rm -v /tmp/.X11-unix:/tmp/.X11-unix hub.foundries.io/lmp/xkiosk:latest www.foundries.io
 
 FROM debian:bullseye-20211011-slim
 
diff --git a/x-kiosk/docker-build.conf b/xkiosk/docker-build.conf
similarity index 100%
rename from x-kiosk/docker-build.conf
rename to xkiosk/docker-build.conf
diff --git a/x-kiosk/docker-compose.yml b/xkiosk/docker-compose.yml
similarity index 84%
rename from x-kiosk/docker-compose.yml
rename to xkiosk/docker-compose.yml
index db9793e..01fd560 100644
--- a/x-kiosk/docker-compose.yml
+++ b/xkiosk/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   xkiosk:
-    image: hub.foundries.io/lmp/x-kiosk:latest
+    image: hub.foundries.io/lmp/xkiosk:latest
     restart: always
     tty: true
     command: "${ADDR-www.foundries.io}"
diff --git a/x-kiosk/start.sh b/xkiosk/start.sh
similarity index 100%
rename from x-kiosk/start.sh
rename to xkiosk/start.sh