17 files changed, 6 insertions, 5 deletions
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>