diff --git a/README.md b/README.md
index 8437c193d..c7428beb3 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ should contain all the components from the `ldp` section of the diagram.
 
 If you are interested in helping out with the development of this server, be
 sure to have a look at the [📓 developer
-notes](documentation/Notes-for-developers.md) and
+notes](guides/developer-notes.md) and
 [🛠️ good first
 issues](https://github.com/solid/community-server/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
 
diff --git a/guides/Create-a-custom-configuration.md b/guides/custom-configurations.md
similarity index 100%
rename from guides/Create-a-custom-configuration.md
rename to guides/custom-configurations.md
diff --git a/guides/Notes-for-developers.md b/guides/developer-notes.md
similarity index 97%
rename from guides/Notes-for-developers.md
rename to guides/developer-notes.md
index 27b0efda3..763e39d41 100644
--- a/guides/Notes-for-developers.md
+++ b/guides/developer-notes.md
@@ -59,8 +59,6 @@ If you edit this config file, `npm run build` MUST have been invoked before so t
 
 Learn more about Components.js in its [documentation](https://componentsjs.readthedocs.io/en/latest/).
 
-[Click here to learn more about creating custom configs](https://github.com/solid/community-server/wiki/Create-a-custom-configuration).
-
 ## Releasing a new version
 
 _This is only relevant to developers with push-access._
@@ -80,4 +78,4 @@ When calling `npm version`, a new entry in `CHANGELOG.md` will [automatically be
 The process will _halt_ until you confirm the changes in `CHANGELOG.md`.
 Before confirming, it is recommended to have a look at this file, move around the commits if needed, and save the file.
 
-**Note:** The changelog generator will make use of git tags to determine the range commit. While `npm version` will generate a git tag, you can also create one manually if you want to follow a different release process.
\ No newline at end of file
+**Note:** The changelog generator will make use of git tags to determine the range commit. While `npm version` will generate a git tag, you can also create one manually if you want to follow a different release process.
diff --git a/guides/FAQ-for-developers.md b/guides/faq.md
similarity index 100%
rename from guides/FAQ-for-developers.md
rename to guides/faq.md