diff --git a/Documentation/Concept.rst b/Documentation/Concept.rst
index f1b36393f6ba78b7bb7a7b92fdd74a2deb26c531..c4a70a5ac14da3a607812ea0587c6e25f5f678ed 100644
--- a/Documentation/Concept.rst
+++ b/Documentation/Concept.rst
@@ -294,7 +294,7 @@ in `indexQfq`. If specific forms or reports should use a different database than
 A `Form` will:
 
 * load the form-definition from `indexQfq` (table `Form` and `FormElement`),
-* loads and save data from/in `indexData` (config.qfq.php) / `dbIndex` (form.parameter.dbIndex),
+* loads and save data from/in `indexData` (qfq.json) / `dbIndex` (form.parameter.dbIndex),
 * retrieve extra information via `dbIndexExtra` - this is useful to offer information from a database and save them in a
   different one.
 
diff --git a/Documentation/GeneralTips.rst b/Documentation/GeneralTips.rst
index 5647cf1b78e35b306f72f96747f37de4c42c9828..86f295efee1574d26bb89b4bb7f05d288466e70f 100644
--- a/Documentation/GeneralTips.rst
+++ b/Documentation/GeneralTips.rst
@@ -130,7 +130,7 @@ Tip on Report: In case the query did not contain any double ticks, just wrap all
  Buggy query:  10.sql = SELECT id, ... FROM MyTable WHERE status={{myVar}} ORDER BY status
  Debug query:  10.sql = SELECT "id, ... FROM MyTable WHERE status={{myVar}} ORDER BY status"
 
-Error read file config.qfq.php: syntax error on line xx
+Error read file qfq.json: syntax error on line xx
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Check the given line number. If it's an SQL statement, enclose it in single or double ticks.
@@ -228,7 +228,7 @@ is shown), than QFQ is the problem.
 Search the given code in `typo3temp/logs/*`, in this example 20180612205917761fc593. You'll should find a stacktrace with
 a more detailed message.
 
-The error might occur if there are problematic characters in config.qfq.php, like single or double ticks inside strings,
+The error might occur if there are problematic characters in qfq.json, like single or double ticks inside strings,
 wich are not enclosed (correctly).
 
 Further T3 Logfile
diff --git a/Documentation/Installation.rst b/Documentation/Installation.rst
index 471418b4ca4ea6e303872936bd2190514ca82158..ef1aab654877b7e3ccde9b767aaf8cbf7d374536 100644
--- a/Documentation/Installation.rst
+++ b/Documentation/Installation.rst
@@ -647,7 +647,7 @@ E.g. to setup a contact address and reuse the information inside your installati
 
       {{ADMINISTRATIVE_CONTACT:Y}}, {{ADMINISTRATIVE_ADDRESS:Y}}, {{ADMINISTRATIVE_NAME}}
 
-It's also possible to configure such variables directly in `config.qfq.php`_.
+Change your custom variables in the T3 Extension Configuration window under Custom.
 
 .. _`fillStoreSystemBySql`:
 
@@ -754,3 +754,4 @@ Cron Job: Remove Form Backup Files
 The following cron job may be used to automatically remove form backup files (see :ref:`formAsFile`) which are older than 31 days. Be sure to adjust the path accordingly: ::
 
   0 19 * * * find /var/www/html/fileadmin/protected/qfqProject/form/.backup/ -type f -mtime +31  -exec rm {} \;
+
diff --git a/extension/Tests/phpunit.md b/extension/Tests/phpunit.md
index f5f121c5c6d366092453c8e222f3b0d10ef136af..7cab89c2c351958c018d63ede14b814e6239a85a 100644
--- a/extension/Tests/phpunit.md
+++ b/extension/Tests/phpunit.md
@@ -5,14 +5,14 @@
 Requirements for running the php unittests:
 - `make bootstrap` was executed
 - The following files exist at the same location (either `extension/` or `typo3conf/`):
-  * `config.qfq.php`
+  * `qfq.json`
   * `LocalConfiguration.php`
-- The database credentials in `config.qfq.php` are correct
+- The database credentials in `qfq.json` are correct
 - The database with the name `DB_1_NAME` followed by `_phpunit` exists. E.g. `app_qfq_phpunit` where `DB_1_NAME=app_qfq`
 
 
-In Tests/Unit/ you may find a mockup of `LocalConfiguration.php` 
-and a template for `config.qfq.php`.
+In Tests/Unit/ you may find a mockup of `LocalConfiguration.php`
+and a template for `qfq.json`.
 
 ## Run unit tests from commandline
 
@@ -29,7 +29,7 @@ Running the tests without specifying these configurations will not work.
 
 ## Autoloader
 
-The test classes use the composer autoloader to reference to the source classes. 
+The test classes use the composer autoloader to reference to the source classes.
 The autoloader is loaded by phpunit before each test
 as specified in phpunit.xml by the line `<phpunit bootstrap="vendor/autoload.php">`
 
@@ -37,4 +37,4 @@ as specified in phpunit.xml by the line `<phpunit bootstrap="vendor/autoload.php
 
 As defined in the phpunit command of projectRoot/Makefile.
 
-The files phpunit_config.qfq.php and phpunit_LocalConfiguration.php are copied outside the extension folder by the Makefile.
\ No newline at end of file
+The files phpunit_qfq.json and phpunit_LocalConfiguration.php are copied outside the extension folder by the Makefile.