diff --git a/developers/fundamentals/qubes-architecture.md b/developers/fundamentals/architecture.md
similarity index 96%
rename from developers/fundamentals/qubes-architecture.md
rename to developers/fundamentals/architecture.md
index 95bd8fec..5d02408e 100644
--- a/developers/fundamentals/qubes-architecture.md
+++ b/developers/fundamentals/architecture.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
-title: Qubes Architecture
-permalink: /doc/qubes-architecture/
+title: Architecture
+permalink: /doc/architecture/
 redirect_from:
+- /doc/qubes-architecture/
 - /en/doc/qubes-architecture/
 - /doc/QubesArchitecture/
 - /wiki/QubesArchitecture/
diff --git a/developers/fundamentals/qubes-net.md b/developers/fundamentals/networking.md
similarity index 98%
rename from developers/fundamentals/qubes-net.md
rename to developers/fundamentals/networking.md
index 2f40cb96..d11bc5b8 100644
--- a/developers/fundamentals/qubes-net.md
+++ b/developers/fundamentals/networking.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
-title: Qubes Networking
-permalink: /doc/qubes-net/
+title: Networking
+permalink: /doc/networking/
 redirect_from:
+- /doc/qubes-net/
 - /en/doc/qubes-net/
 - /doc/QubesNet/
 - /wiki/QubesNet/
diff --git a/developers/system-doc.md b/developers/system-doc.md
index 09fcb883..5f4cb4a3 100644
--- a/developers/system-doc.md
+++ b/developers/system-doc.md
@@ -13,13 +13,13 @@ System Documentation for Developers
 
 Fundamentals
 ------------
- * [Qubes OS Architecture Overview](/doc/qubes-architecture/)
+ * [Qubes OS Architecture Overview](/doc/architecture/)
  * [Qubes OS Architecture Spec v0.3 [PDF]](/attachment/wiki/QubesArchitecture/arch-spec-0.3.pdf)  
    (The original 2009 document that started this all...)
  * [Security-critical elements of Qubes OS](/doc/security-critical-code/)
  * [Qrexec: command execution in VMs](/doc/qrexec3/)
  * [Qubes GUI virtualization protocol](/doc/gui/)
- * [Networking in Qubes](/doc/qubes-net/)
+ * [Networking in Qubes](/doc/networking/)
  * [Implementation of template sharing and updating](/doc/template-implementation/)
 
 Services