25 files changed, 18 insertions, 17 deletions
diff --git a/community/gsoc/project_ideas.mdwn b/community/gsoc/project_ideas.mdwn
index c4b665b7..8f2fe385 100644
--- a/community/gsoc/project_ideas.mdwn
+++ b/community/gsoc/project_ideas.mdwn
@@ -340,7 +340,7 @@ GSoC 2008. He is still working on some outstanding issues.
 
 Although a driver framework in userspace would be desirable, presently the Hurd
 uses kernel drivers in the microkernel,
-[[GNU_Mach|microkernel/mach/gnumach]]. (And changing this would be far beyond a
+[[microkernel/mach/GNU_Mach]]. (And changing this would be far beyond a
 GSoC project...)
 
 The problem is that the drivers in GNU Mach are presently old Linux drivers
@@ -590,7 +590,7 @@ pthreads.
 
 The Hurd presently has no sound support.  Fixing this, [[GNU_Savannah_task
 5485]], requires two steps: the first is to port some other kernel's drivers to
-[[GNU_Mach|microkernel/mach/gnumach]] so we can get access to actual sound
+[[microkernel/mach/GNU_Mach]] so we can get access to actual sound
 hardware.  The second is to implement a userspace server ([[hurd/translator]]),
 that implements an interface on top of the kernel device that can be used by
 applications -- probably OSS or maybe ALSA.
@@ -741,7 +741,7 @@ directories and attaching other translators.
 
 Although there are some attempts to move to a more modern microkernel
 alltogether, the current Hurd implementation is based on
-[[GNU_Mach|microkernel/mach/gnumach]], which is only a slightly modified
+[[microkernel/mach/GNU_Mach]], which is only a slightly modified
 variant of the original CMU [[microkernel/Mach]].
 
 Unfortunately, Mach was created about two decades ago, and is in turn based on
diff --git a/contributing.mdwn b/contributing.mdwn
index 4b731065..f21a6f32 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -33,7 +33,7 @@ There are essential two kinds of Hurd system designs.
 ## Hurd on Mach
 
 For one there's the implementation of the *[[Hurd]] running on the
-[[GNU_Mach_microkernel|microkernel/mach/gnumach]]*.  This is what is commonly
+[[microkernel/mach/GNU_Mach]] microkernel*.  This is what is commonly
 meant when people are talking about GNU/Hurd systems.
 
 This system has mostly been designed and implemented [in the
@@ -84,8 +84,8 @@ Here is a [[list_of_open_issues|hurd/Open_Issues]] for the [[GNU_Hurd|hurd]].
 
 ### Open Issues: GNU Mach
 
-Here is a [[list_of_open_issues|microkernel/mach/gnumach/Open_Issues]] for
-[[GNU_Mach|microkernel/mach/gnumach]].
+Here is a [[list_of_open_issues|microkernel/mach/gnu_mach/Open_Issues]] for
+[[microkernel/mach/GNU_Mach]].
 
 ### Open Issues: GNU MIG
 
diff --git a/hurd/building/cross-compiling.mdwn b/hurd/building/cross-compiling.mdwn
index 11afc97f..31722ead 100644
--- a/hurd/building/cross-compiling.mdwn
+++ b/hurd/building/cross-compiling.mdwn
@@ -98,7 +98,7 @@ guarantee is given.  Always the preferred version is listed first.
         `gcc-4_3-branch` needs.
         -->
 
-* `src/gnumach`: [[GNU_Mach|microkernel/mach/gnumach]]
+* `src/gnumach`: [[microkernel/mach/GNU_Mach]]
 
     * CVS `gnumach-1-branch`
 
diff --git a/hurd/getting_help.mdwn b/hurd/getting_help.mdwn
index 342410dd..c4f80ff9 100644
--- a/hurd/getting_help.mdwn
+++ b/hurd/getting_help.mdwn
@@ -11,7 +11,7 @@ is included in the section entitled
 # Essential Documentation
 
 * [[FAQ]]
-* [[microkernel/mach/gnumach/Hardware_Compatibility_List]]
+* [[microkernel/mach/gnu_mach/Hardware_Compatibility_List]]
 
 # Forums
 
diff --git a/hurd/libstore.mdwn b/hurd/libstore.mdwn
index ab649ebc..3de42be3 100644
--- a/hurd/libstore.mdwn
+++ b/hurd/libstore.mdwn
@@ -9,7 +9,7 @@ is included in the section entitled
 [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
 `libstore` is more than just a thin layer between
-[[GNU_Mach|microkernel/mach/gnumach]] devices (`hd0` for example) and the
+[[microkernel/mach/GNU_Mach]] devices (`hd0` for example) and the
 device node below `/dev`...
 
 # Available Stores
diff --git a/hurd/running.mdwn b/hurd/running.mdwn
index 162bc9ea..78815099 100644
--- a/hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -9,7 +9,7 @@ is included in the section entitled
 [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
 * [[Distrib]] - Distributions based on the Hurd
-* [[microkernel/mach/gnumach/ports/Xen]] - In Xen
+* [[microkernel/mach/gnu_mach/ports/Xen]] - In Xen
 * [[Live_CD]]
 * [[QEMU]] - In QEMU
 * [[vmware]] (**non-free!**)
diff --git a/microkernel/mach.mdwn b/microkernel/mach.mdwn
index 078b531f..7e63c724 100644
--- a/microkernel/mach.mdwn
+++ b/microkernel/mach.mdwn
@@ -9,7 +9,7 @@ microkernel currently used by the [[Hurd]].
 
 # Implementations
 
-* [[GNUMach]]
+* [[GNU_Mach]]
 * [[Mach/OskitMach]] - A Once Successor of Mach based on OSKit
 * [Apple's Darwin](http://developer.apple.com/darwin/) ([API](http://developer.apple.com/documentation/Darwin/Conceptual/KernelProgramming/index.html)) (**non-free**)
 
diff --git a/microkernel/mach/gnumach.mdwn b/microkernel/mach/gnu_mach.mdwn
index d45549f5..d45549f5 100644
--- a/microkernel/mach/gnumach.mdwn
+++ b/microkernel/mach/gnu_mach.mdwn
diff --git a/microkernel/mach/gnumach/boot_trace.mdwn b/microkernel/mach/gnu_mach/boot_trace.mdwn
index a08384f0..a08384f0 100644
--- a/microkernel/mach/gnumach/boot_trace.mdwn
+++ b/microkernel/mach/gnu_mach/boot_trace.mdwn
diff --git a/microkernel/mach/gnumach/building.mdwn b/microkernel/mach/gnu_mach/building.mdwn
index 27573b64..ef0d8553 100644
--- a/microkernel/mach/gnumach/building.mdwn
+++ b/microkernel/mach/gnu_mach/building.mdwn
@@ -1,9 +1,9 @@
 Additional to the following text, a further [[example]] has be posted.
 
 
-# Building [[GNUMach]] from Source
+# Building [[GNU_Mach]] from Source
 
-If you want to build the [[GNUMach]] kernel yourself instead of just using a
+If you want to build the [[GNU_Mach]] kernel yourself instead of just using a
 pre-built binary, follow these instructions.
 
 The unpacked source tree is around 20 MiB, and the build tree (with all drivers
@@ -65,7 +65,7 @@ Start the build process with
 
     $ dpkg-buildpackage -us -uc -b -rfakeroot
 
-[[GNUMach]] is now building.  To use the new kernel, you must install the
+[[GNU_Mach]] is now building.  To use the new kernel, you must install the
 resulting `.deb` package which is located one directory above the build
 directory and has a similar name as the build directory, e.g.
 
diff --git a/microkernel/mach/gnumach/building/example.mdwn b/microkernel/mach/gnu_mach/building/example.mdwn
index 6da05c5b..6da05c5b 100644
--- a/microkernel/mach/gnumach/building/example.mdwn
+++ b/microkernel/mach/gnu_mach/building/example.mdwn
diff --git a/microkernel/mach/gnumach/debugging.mdwn b/microkernel/mach/gnu_mach/debugging.mdwn
index fa2a9d42..fa2a9d42 100644
--- a/microkernel/mach/gnumach/debugging.mdwn
+++ b/microkernel/mach/gnu_mach/debugging.mdwn
diff --git a/microkernel/mach/gnumach/hardware_compatibility_list.mdwn b/microkernel/mach/gnu_mach/hardware_compatibility_list.mdwn
index 09882467..09882467 100644
--- a/microkernel/mach/gnumach/hardware_compatibility_list.mdwn
+++ b/microkernel/mach/gnu_mach/hardware_compatibility_list.mdwn
diff --git a/microkernel/mach/gnumach/hardware_compatibility_list/discussion.mdwn b/microkernel/mach/gnu_mach/hardware_compatibility_list/discussion.mdwn
index 69ca3190..69ca3190 100644
--- a/microkernel/mach/gnumach/hardware_compatibility_list/discussion.mdwn
+++ b/microkernel/mach/gnu_mach/hardware_compatibility_list/discussion.mdwn
diff --git a/microkernel/mach/gnumach/open_issues.mdwn b/microkernel/mach/gnu_mach/open_issues.mdwn
index 433ec3ef..433ec3ef 100644
--- a/microkernel/mach/gnumach/open_issues.mdwn
+++ b/microkernel/mach/gnu_mach/open_issues.mdwn
diff --git a/microkernel/mach/gnumach/ports.mdwn b/microkernel/mach/gnu_mach/ports.mdwn
index 00cdee8c..00cdee8c 100644
--- a/microkernel/mach/gnumach/ports.mdwn
+++ b/microkernel/mach/gnu_mach/ports.mdwn
diff --git a/microkernel/mach/gnumach/ports/xen.mdwn b/microkernel/mach/gnu_mach/ports/xen.mdwn
index cdb4e2de..cdb4e2de 100644
--- a/microkernel/mach/gnumach/ports/xen.mdwn
+++ b/microkernel/mach/gnu_mach/ports/xen.mdwn
diff --git a/microkernel/mach/gnumach/ports/xen/internals.mdwn b/microkernel/mach/gnu_mach/ports/xen/internals.mdwn
index 09e707ea..09e707ea 100644
--- a/microkernel/mach/gnumach/ports/xen/internals.mdwn
+++ b/microkernel/mach/gnu_mach/ports/xen/internals.mdwn
diff --git a/microkernel/mach/gnumach/ports/xen/networking_configuration.mdwn b/microkernel/mach/gnu_mach/ports/xen/networking_configuration.mdwn
index 71a72bac..71a72bac 100644
--- a/microkernel/mach/gnumach/ports/xen/networking_configuration.mdwn
+++ b/microkernel/mach/gnu_mach/ports/xen/networking_configuration.mdwn
diff --git a/microkernel/mach/gnumach/projects.mdwn b/microkernel/mach/gnu_mach/projects.mdwn
index 9ace6270..9ace6270 100644
--- a/microkernel/mach/gnumach/projects.mdwn
+++ b/microkernel/mach/gnu_mach/projects.mdwn
diff --git a/microkernel/mach/gnumach/projects/clean_up_the_code.mdwn b/microkernel/mach/gnu_mach/projects/clean_up_the_code.mdwn
index 875bb8cd..875bb8cd 100644
--- a/microkernel/mach/gnumach/projects/clean_up_the_code.mdwn
+++ b/microkernel/mach/gnu_mach/projects/clean_up_the_code.mdwn
diff --git a/microkernel/mach/gnumach/projects/gdb_stubs.mdwn b/microkernel/mach/gnu_mach/projects/gdb_stubs.mdwn
index 9a11a82b..9a11a82b 100644
--- a/microkernel/mach/gnumach/projects/gdb_stubs.mdwn
+++ b/microkernel/mach/gnu_mach/projects/gdb_stubs.mdwn
diff --git a/microkernel/mach/history.mdwn b/microkernel/mach/history.mdwn
index a8951737..8f4b528b 100644
--- a/microkernel/mach/history.mdwn
+++ b/microkernel/mach/history.mdwn
@@ -41,7 +41,7 @@ Meanwhile, OSKit became unmaintained, thus posing more of a burden on than being
 In 2005 Gianluca Guida started a different attempt to use the osenv interface with minimal changes to GNU Mach 1.x, thus allowing use of the generic driver interface while importing as little of the umaintained OSKit code as possible. However, there turned out to be serious problems with OSKit, so this attempt was abandoned as well.
 
 Today, GNU Mach development focuses on the 1.x branch again -- see also this
-list of [[gnumach/projects]].
+list of [[gnu_mach/projects]].
 
 # <a name="Status_of_the_project"> Status of the project </a>
 
diff --git a/microkernel/mach/mig/building.mdwn b/microkernel/mach/mig/building.mdwn
index ee299166..2ec75e38 100644
--- a/microkernel/mach/mig/building.mdwn
+++ b/microkernel/mach/mig/building.mdwn
@@ -29,7 +29,8 @@ Building the Mach Interface Generator requires the _build-essential_ and _fakero
 
 Building the Mach Interface Generator requires a C compiler, a standard C library (with corresponding header files) and your favourite flavor of awk (gawk), yacc (bison), lex (flex) and make.
 
-Additionally, you need to have GNU Mach's header files installed. See [[mach/gnumach/building]] about how to do that, then come back here.
+Additionally, you need to have GNU Mach's header files installed.  See
+[[mach/gnu_mach/building]] about how to do that, then come back here.
 
 ## <a name="Building_and_Installing"> Building and Installing </a>
 
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 0ac0561c..a368c6c3 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -22,7 +22,7 @@ Hurd!
   * *[[Hurd/Documentation]]*
   * *[[hurd/Running]]*"]]
 * **[[microkernel/Mach]]**[[if test="destpage(microkernel/mach*)" then="
-  * *[[GNU_Mach|microkernel/mach/gnumach]]*
+  * *[[microkernel/mach/GNU_Mach]]*
   * *[[microkernel/mach/Documentation]]*"]]
 
 ---