diff --git a/Makefile b/Makefile
index a298cbd..438ed12 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,9 @@ test: e2etest daemontest unittest crontest
 #
 # Run a set of end-to-end tests.
 #
-# Test scenarios are described and configured by the test/e2e.ini
-# file.  Basically this is just a script that feeds GPG Mailgate with
-# known input and checks whether output meets expectations.
+# Test scenarios are described and configured by the test/e2e.ini file.
+# Basically this is just a script that feeds Lacre with known input and checks
+# whether output meets expectations.
 #
 e2etest: test/tmp test/logs pre-clean restore-keyhome
 	$(PYTHON) test/e2e_test.py
@@ -39,11 +39,11 @@ e2etest: test/tmp test/logs pre-clean restore-keyhome
 # Run a basic cron-job test.
 #
 # We use PYTHONPATH to make sure that cron.py can import GnuPG
-# package.  We also set GPG_MAILGATE_CONFIG env. variable to make sure
+# package.  We also set LACRE_CONFIG env. variable to make sure
 # it slurps the right config.
 #
 crontest: clean-db $(TEST_DB)
-	GPG_MAILGATE_CONFIG=test/gpg-mailgate-cron-test.conf PYTHONPATH=`pwd`	\
+	LACRE_CONFIG=test/lacre-cron.conf PYTHONPATH=`pwd`	\
 	$(PYTHON) webgate-cron.py
 
 $(TEST_DB):
@@ -64,10 +64,10 @@ clean-db:
 # Run unit tests
 #
 unittest:
-	GPG_MAILGATE_CONFIG=test/gpg-mailgate.conf $(PYTHON) -m unittest discover -s test/modules
+	LACRE_CONFIG=test/gpg-mailgate.conf $(PYTHON) -m unittest discover -s test/modules
 
 pre-clean:
-	rm -fv test/gpg-mailgate.conf
+	rm -fv test/lacre.conf
 	rm -f test/logs/*.log
 
 restore-keyhome:
diff --git a/doc/adv-filt.md b/doc/adv-filt.md
index 42dc8df..be44c41 100644
--- a/doc/adv-filt.md
+++ b/doc/adv-filt.md
@@ -33,13 +33,13 @@ setting port to `10026`.
 Command to spawn a Lacre daemon process is:
 
 ```
-GPG_MAILGATE_CONFIG=/etc/gpg-mailgate.conf PYTHONPATH=... python -m lacre.daemon
+LACRE_CONFIG=/etc/lacre.conf PYTHONPATH=... python -m lacre.daemon
 ```
 
 Two environment variables used here are:
 
-  * `GPG_MAILGATE_CONFIG` (not mandatory) -- path to Lacre configuration,
-    unless it's kept in default location (`/etc/gpg-maillgate.conf`).
+  * `LACRE_CONFIG` (not mandatory) -- path to Lacre configuration,
+    unless it's kept in default location (`/etc/lacre.conf`).
   * `PYTHONPATH` (not mandatory) -- location of Lacre modules. You can place
     them below your Python's `site-packages` to be reachable by any other
     Python software.
diff --git a/test/daemon_test.py b/test/daemon_test.py
index 48e5dfb..2641fed 100644
--- a/test/daemon_test.py
+++ b/test/daemon_test.py
@@ -30,7 +30,7 @@ def _spawn(cmd):
         "PATH": os.getenv("PATH"),
         "PYTHONPATH": os.getcwd(),
         "LANG": 'en_US.UTF-8',
-        "GPG_MAILGATE_CONFIG": "test/gpg-mailgate-daemon-test.conf"
+        "LACRE_CONFIG": "test/lacre-daemon.conf"
         }
     logging.debug(f"Spawning command: {cmd} with environment: {env_dict!r}")
     return subprocess.Popen(cmd,
diff --git a/test/e2e.ini b/test/e2e.ini
index df2e726..89147b9 100644
--- a/test/e2e.ini
+++ b/test/e2e.ini
@@ -32,8 +32,8 @@ certs: test/certs
 e2e_log: test/logs/e2e.log
 e2e_log_format: %(asctime)s %(pathname)s:%(lineno)d %(levelname)s [%(funcName)s] %(message)s
 e2e_log_datefmt: %Y-%m-%d %H:%M:%S
-lacre_log: test/logs/gpg-mailgate.log
-log_config: test/gpg-lacre-log.ini
+lacre_log: test/logs/lacre-simple.log
+log_config: test/lacre-logging.conf
 
 # TEST IDENTITIES AND SETTINGS:
 #
diff --git a/test/gpg-mailgate-cron-test.conf b/test/lacre-cron.conf
similarity index 100%
rename from test/gpg-mailgate-cron-test.conf
rename to test/lacre-cron.conf
diff --git a/test/gpg-mailgate-daemon-test.conf b/test/lacre-daemon.conf
similarity index 100%
rename from test/gpg-mailgate-daemon-test.conf
rename to test/lacre-daemon.conf
diff --git a/test/gpg-lacre-log.ini b/test/lacre-logging.conf
similarity index 100%
rename from test/gpg-lacre-log.ini
rename to test/lacre-logging.conf