diff --git a/ChangeLog b/ChangeLog
index 69bc612ba..0888fd244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-02 02:07-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Headers/Additions/GNUstepGUI/GSNibCompatibility.h: Remove
+	* Headers/Additions/GNUstepGUI/GSNibTemplates.h: Remove 
+	* Source/GNUmakefile: Update to reference new files.
+	* Source/GSGormLoader.m: Change to reference the 
+	* Source/GSGormLoading.m: New gorm loading file.
+	* Source/GSNibCompatibility.m: Removed.
+	* Source/GSNibLoader.m: Reference the new file.
+	* Source/GSNibLoading.m: New file containing the nib loading logic.
+	* Source/GSNibTemplates.m: Removed.
+
 2008-12-02 01:21-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSNibCompatibility.m: Fix for bug #24979.   Change in 
diff --git a/Headers/Additions/GNUstepGUI/GSNibTemplates.h b/Headers/Additions/GNUstepGUI/GSGormLoading.h
similarity index 100%
rename from Headers/Additions/GNUstepGUI/GSNibTemplates.h
rename to Headers/Additions/GNUstepGUI/GSGormLoading.h
diff --git a/Headers/Additions/GNUstepGUI/GSNibCompatibility.h b/Headers/Additions/GNUstepGUI/GSNibLoading.h
similarity index 100%
rename from Headers/Additions/GNUstepGUI/GSNibCompatibility.h
rename to Headers/Additions/GNUstepGUI/GSNibLoading.h
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 818024cca..e8959d3ca 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -211,8 +211,8 @@ NSTextView_actions.m \
 GSLayoutManager.m \
 GSTypesetter.m \
 GSHorizontalTypesetter.m \
-GSNibTemplates.m \
-GSNibCompatibility.m \
+GSGormLoading.m \
+GSNibLoading.m \
 GSTitleView.m \
 GSToolTips.m \
 GSToolbar.m \
@@ -404,7 +404,7 @@ GSServicesManager.h \
 GSTextConverter.h \
 GSTrackingRect.h \
 GSHelpManagerPanel.h \
-GSNibTemplates.h \
+GSGormLoading.h \
 GSNibContainer.h \
 GSDisplayServer.h \
 GSFusedSilica.h \
@@ -420,7 +420,7 @@ GSTypesetter.h \
 GSHorizontalTypesetter.h \
 GSToolbar.h \
 GSToolbarView.h \
-GSNibCompatibility.h \
+GSNibLoading.h \
 GSDragView.h \
 GSTitleView.h \
 GSPrinting.h \
diff --git a/Source/GSGormLoader.m b/Source/GSGormLoader.m
index a3a5ac0c5..9646d26c8 100644
--- a/Source/GSGormLoader.m
+++ b/Source/GSGormLoader.m
@@ -30,7 +30,7 @@
 #include <AppKit/AppKit.h>
 
 #include "GNUstepGUI/GSModelLoaderFactory.h"
-#include "GNUstepGUI/GSNibTemplates.h"
+#include "GNUstepGUI/GSGormLoading.h"
 
 @interface GSGormLoader : GSModelLoader
 @end
diff --git a/Source/GSNibTemplates.m b/Source/GSGormLoading.m
similarity index 99%
rename from Source/GSNibTemplates.m
rename to Source/GSGormLoading.m
index fc6011b7e..3a1370b66 100644
--- a/Source/GSNibTemplates.m
+++ b/Source/GSGormLoading.m
@@ -1,4 +1,4 @@
-/** <title>GSNibTemplates</title>
+/** <title>GSGormLoading</title>
 
    <abstract>Contains all of the private classes used in .gorm files.</abstract>
 
@@ -53,7 +53,7 @@
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSScreen.h>
 #include <GNUstepBase/GSObjCRuntime.h>
-#include <GNUstepGUI/GSNibTemplates.h>
+#include <GNUstepGUI/GSGormLoading.h>
 
 static const int currentVersion = 1; // GSNibItem version number...
 
diff --git a/Source/GSNibLoader.m b/Source/GSNibLoader.m
index cd294e4fe..97d2f041a 100644
--- a/Source/GSNibLoader.m
+++ b/Source/GSNibLoader.m
@@ -30,7 +30,7 @@
 #include <AppKit/AppKit.h>
 
 #include "GNUstepGUI/GSModelLoaderFactory.h"
-#include "GNUstepGUI/GSNibCompatibility.h"
+#include "GNUstepGUI/GSNibLoading.h"
 
 @interface GSNibLoader : GSModelLoader
 @end
diff --git a/Source/GSNibCompatibility.m b/Source/GSNibLoading.m
similarity index 99%
rename from Source/GSNibCompatibility.m
rename to Source/GSNibLoading.m
index 38dc97242..77719b285 100644
--- a/Source/GSNibCompatibility.m
+++ b/Source/GSNibLoading.m
@@ -1,4 +1,4 @@
-/** <title>GSNibCompatibility</title>
+/** <title>GSNibLoading</title>
 
    <abstract>
    These are templates for use with OSX Nib files.  These classes are the