diff --git a/.env.example b/.env.example
index 3b6df6e..3376bef 100644
--- a/.env.example
+++ b/.env.example
@@ -4,7 +4,7 @@ TYPE=docker
 QRCODE_GENERATOR=internal-chillerlan.qrcode
 BASE_URL=http://localhost
 
-DATABASE_HOST=php-dynamic-qrcode-db
+DATABASE_HOST=qrforge-db
 DATABASE_PORT=3306
 DATABASE_NAME=qrcode
 DATABASE_USER=qrcode
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 178d2d4..ce73de0 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -9,11 +9,11 @@ services:
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
     depends_on:
-      - php-dynamic-qrcode
+      - qrforge-app
     networks:
-      - php-dynamic-qrcode-network
+      - qrforge-network
 
-  php-dynamic-qrcode:
+  qrforge-app:
     build:
       context: .
       dockerfile: Dockerfile.fpm
@@ -22,7 +22,7 @@ services:
       TYPE: "docker"
       QRCODE_GENERATOR: "${QRCODE_GENERATOR:-internal-chillerlan.qrcode}"
       BASE_URL: "${BASE_URL:?set BASE_URL in .env, e.g. https://qr.ensembia.com}"
-      DATABASE_HOST: "php-dynamic-qrcode-db"
+      DATABASE_HOST: "qrforge-db"
       DATABASE_PORT: "3306"
       DATABASE_NAME: "${DATABASE_NAME:-qrcode}"
       DATABASE_USER: "${DATABASE_USER:-qrcode}"
@@ -30,18 +30,18 @@ services:
       DATABASE_PREFIX: "${DATABASE_PREFIX:-}"
       DATABASE_CHARSET: "${DATABASE_CHARSET:-utf8}"
     depends_on:
-      php-dynamic-qrcode-db:
+      qrforge-db:
         condition: service_healthy
     volumes:
-      - php_dynamic_qrcode_saved_qrcode_data:/var/www/qrcode-storage
+      - qrforge_qrcode_storage:/var/www/qrcode-storage
     networks:
-      - php-dynamic-qrcode-network
+      - qrforge-network
 
-  php-dynamic-qrcode-db:
+  qrforge-db:
     image: "mysql:8.0"
     restart: "unless-stopped"
     volumes:
-      - php_dynamic_qrcode_db_data:/var/lib/mysql
+      - qrforge_db_data:/var/lib/mysql
       - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
       MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?set MYSQL_ROOT_PASSWORD in .env}"
@@ -54,12 +54,12 @@ services:
       timeout: 5s
       retries: 10
     networks:
-      - php-dynamic-qrcode-network
+      - qrforge-network
 
 volumes:
-  php_dynamic_qrcode_db_data:
-  php_dynamic_qrcode_saved_qrcode_data:
+  qrforge_db_data:
+  qrforge_qrcode_storage:
 
 networks:
-  php-dynamic-qrcode-network:
+  qrforge-network:
     driver: bridge
diff --git a/docker-compose.yml b/docker-compose.yml
index 02ad435..1c4ec47 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 services:
-  php-dynamic-qrcode:
+  qrforge-app:
     build:
       context: .
       dockerfile: Dockerfile
@@ -8,7 +8,7 @@ services:
       TYPE: "${TYPE:-docker}"
       QRCODE_GENERATOR: "${QRCODE_GENERATOR:-internal-chillerlan.qrcode}"
       BASE_URL: "${BASE_URL:-http://localhost}"
-      DATABASE_HOST: "php-dynamic-qrcode-db"
+      DATABASE_HOST: "qrforge-db"
       DATABASE_PORT: "3306"
       DATABASE_NAME: "${DATABASE_NAME:-qrcode}"
       DATABASE_USER: "${DATABASE_USER:-qrcode}"
@@ -18,18 +18,18 @@ services:
     ports:
       - "80:80"
     depends_on:
-      php-dynamic-qrcode-db:
+      qrforge-db:
         condition: service_healthy
     volumes:
-      - php_dynamic_qrcode_saved_qrcode_data:/var/www/qrcode-storage
+      - qrforge_qrcode_storage:/var/www/qrcode-storage
     networks:
-      - php-dynamic-qrcode-network
+      - qrforge-network
 
-  php-dynamic-qrcode-db:
+  qrforge-db:
     image: "mysql:8.0"
     restart: "unless-stopped"
     volumes:
-      - php_dynamic_qrcode_db_data:/var/lib/mysql
+      - qrforge_db_data:/var/lib/mysql
       - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
       MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?zet MYSQL_ROOT_PASSWORD in .env}"
@@ -42,12 +42,12 @@ services:
       timeout: 5s
       retries: 10
     networks:
-      - php-dynamic-qrcode-network
+      - qrforge-network
 
 volumes:
-  php_dynamic_qrcode_db_data:
-  php_dynamic_qrcode_saved_qrcode_data:
+  qrforge_db_data:
+  qrforge_qrcode_storage:
 
 networks:
-  php-dynamic-qrcode-network:
+  qrforge-network:
     driver: bridge
diff --git a/nginx.conf b/nginx.conf
index d79c755..f56e384 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -15,7 +15,7 @@ server {
     }
 
     location ~ \.php$ {
-        fastcgi_pass php-dynamic-qrcode:9000;
+        fastcgi_pass qrforge-app:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;