diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index c9b3a03dc0..b5e7bcbe0e 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -1,7 +1,7 @@
 ### this is the part you can customize if you need to
 
 # base name of doc
-DOC = gstreamer-faq
+DOC = faq
 
 # main xml file
 MAIN = $(DOC).xml
diff --git a/docs/faq/gstreamer-faq.xml b/docs/faq/faq.xml
similarity index 100%
rename from docs/faq/gstreamer-faq.xml
rename to docs/faq/faq.xml
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 9ab655a808..7fdbb567ff 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,7 +1,7 @@
 ### this is the part you can customize if you need to
 
 # base name of doc
-DOC = gstreamer-manual
+DOC = manual
 
 # main xml file
 MAIN = $(DOC).xml
diff --git a/docs/manual/gstreamer-manual.xml b/docs/manual/manual.xml
similarity index 100%
rename from docs/manual/gstreamer-manual.xml
rename to docs/manual/manual.xml
diff --git a/docs/pwg/gst-plugin-writers-guide.xml b/docs/pwg/pwg.xml
similarity index 100%
rename from docs/pwg/gst-plugin-writers-guide.xml
rename to docs/pwg/pwg.xml