diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1bab7c31..b8febfc6 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ If you encounter a bug and something does not work, make sure you have done the
 - [ ] Specify used docker versions (php, web and database)
 - [ ] Attach logs for php, mysql and webserver (found in `log/` directory)
 - [ ] Start with debug mode and attach docker-compose output (`.env` setting `DEBUG_COMPOSE_ENTRYPOINT=1`)
-- [ ] Never use different mysql|mariadb versions on the same `HOST_PATH_TO_MYSQL_DATADIR` on existing database files. Different mysql|mariadb versions might upgrade/corrupt existing database files. If you have done that already, start with a different path of `HOST_PATH_TO_MYSQL_DATADIR` (to an empty directory) and try again.
+- [ ] Never use different mysql|mariadb versions on the same `HOST_PATH_MYSQL_DATADIR` on existing database files. Different mysql|mariadb versions might upgrade/corrupt existing database files. If you have done that already, start with a different path of `HOST_PATH_MYSQL_DATADIR` (to an empty directory) and try again.
 
 Please also specify the following info:
 
diff --git a/env-example b/env-example
index a13ca9e2..b5c269be 100644
--- a/env-example
+++ b/env-example
@@ -442,10 +442,10 @@ HTTPD_TEMPLATE_DIR=.devilbox
 ###
 ### MySQL root user password
 ###
-### If $HOST_PATH_TO_MYSQL_DATADIR already contains an existing
+### If $HOST_PATH_MYSQL_DATADIR already contains an existing
 ### mysql datadir, enter the password for the existing mysql database
 ###
-### If $HOST_PATH_TO_MYSQL_DATADIR is empty, choose a new password that
+### If $HOST_PATH_MYSQL_DATADIR is empty, choose a new password that
 ### will be applied
 ###
 MYSQL_ROOT_PASSWORD=