diff --git a/ChangeLog b/ChangeLog
index 6940e06..d69c503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2004-01-12  David Ayers  <d.ayers@inode.at>
+
+	* gsweb.make.in: Change 'WO' framework names to WobObjects,
+	WOExtensions and WOExtensionsGSW.
+	* GSWeb.framework/GNUmakefile: Ditto.
+	* GSWeb.framework/Makefile.postamble. Ditto.
+	* GSWExtensions.framework/Makefile.preamble: Ditto.
+	* GSWExtensionsGSW.framework/Makefile.preamble: Ditto.
+	* GSWExtensionsGSW.framework/GNUmakefile: Ditto.
+	* GSWExtensions.framework/GNUmakefile: Ditto.  Move top level
+	GSWSessionRestorationErrorPage.gswd into
+	GSWSessionRestorationErrorPage.gswc.
+	* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswd
+	* GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/
+	  GSWSessionRestorationErrorPage.gswd
+	Moved contents into component.
+	* GSWExtensions.framework/Makefile.postamble: Install components
+	for 'WO' names correctly.
+	* GSWExtensionsGSW.framework/Makefile.postamble: Ditto.
+
+	* GSWExtensions.framework/French.lproj/
+	  GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd:
+	Use correct #include syntax.
+
+	* GSWeb.framework/GSWWOCompatibility.h: Add WOExceptionPage.
+	* GSWeb.framework/GSWApplication.m
+	([GSWApplication handleException:inContext:]): Remove temporary
+	hack to load 'GSW' exception page for 'WO' names.
+	* GSWExtensions.framework/GSWExceptionPage.m
+	([GSWExceptionPage setException:]): Remove excess exception log.
+
 2004-01-09   Manuel Guesdon <mguesdon@orange-concept.com>
 
 	* GSWExtensionsGSW.framework/GSWLogin.m:
diff --git a/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd b/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd
index 7ad8385..15d2327 100644
--- a/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd
+++ b/GSWExtensions.framework/French.lproj/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd
@@ -1 +1 @@
-#include "GSWSessionCreationErrorPage.gswc"
+#include "GSWSessionCreationErrorPage"
diff --git a/GSWExtensions.framework/GNUmakefile b/GSWExtensions.framework/GNUmakefile
index 34e3850..f5e7ccc 100644
--- a/GSWExtensions.framework/GNUmakefile
+++ b/GSWExtensions.framework/GNUmakefile
@@ -39,10 +39,10 @@ ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWExtensions
 endif
 ifeq ($(gswnames), wo)
-FRAMEWORK_NAME = GSWExtensions_wo
+FRAMEWORK_NAME = WOExtensions
 endif
 ifeq ($(gswnames), all)
-FRAMEWORK_NAME = GSWExtensions GSWExtensions_wo
+FRAMEWORK_NAME = GSWExtensions WOExtensions
 endif
 
 # Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC
@@ -51,49 +51,71 @@ GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE)
 DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
 endif
 
-GSWExtensions_wo_CPPFLAGS = -DGSWEB_WONAMES
+WOExtensions_CPPFLAGS = -DGSWEB_WONAMES
 
 # The framework resource files and directories
 GSWExtensions_RESOURCE_FILES = \
 Resources/Info-gnustep.plist \
-GSWSessionRestorationErrorPage.gswd
-GSWExtensions_wo_RESOURCE_FILES = $(GSWExtensions_RESOURCE_FILES)
 
-GSWExtensions_COMPONENTS = \
-GSWSessionCreationErrorPage.gswc \
-GSWSessionRestorationErrorPage.gswc \
-GSWCollapsibleComponentContent.gswc \
-GSWPageRestorationErrorPage.gswc \
-GSWStatsPage.gswc \
-GSWDictionaryRepetition.gswc \
-GSWTable.gswc \
-GSWExceptionPage.gswc \
-GSWTableString.gswc \
-GSWIFrame.gswc \
-GSWMetaRefresh.gswc \
-GSWRedirect.gswc \
-GSWKeyValueConditional.gswc \
+WOExtensions_RESOURCE_FILES = $(GSWExtensions_RESOURCE_FILES)
 
-#GSWCompletionBar.gswc 
-#GSWAnyField.gswc 
-#GSWSimpleArrayDisplay.gswc 
-#GSWAppleScript.gswc 
-#GSWSimpleArrayDisplay2.gswc 
-#GSWBatchNavigationBar.gswc 
-#GSWSortOrder.gswc 
-#GSWSortOrderManyKey.gswc 
-#GSWThresholdColoredNumber.gswc 
-#GSWToManyRelationship.gswc 
-#GSWPageRestorationErrorPage.gswc 
-#GSWToOneRelationship.gswc 
-GSWExtensions_wo_COMPONENTS = $(GSWExtensions_COMPONENTS)
+Extensions_COMPONENTS = \
+SessionCreationErrorPage \
+SessionRestorationErrorPage \
+CollapsibleComponentContent \
+PageRestorationErrorPage \
+StatsPage \
+DictionaryRepetition \
+Table \
+ExceptionPage \
+TableString \
+IFrame \
+MetaRefresh \
+Redirect \
+KeyValueConditional \
+
+#CompletionBar 
+#AnyField 
+#SimpleArrayDisplay 
+#AppleScript 
+#SimpleArrayDisplay2 
+#BatchNavigationBar 
+#SortOrder 
+#SortOrderManyKey 
+#ThresholdColoredNumber 
+#ToManyRelationship 
+#PageRestorationErrorPage 
+#ToOneRelationship 
+
+Extensions_LOCALIZED_RESOURCE_FILES = \
+ExceptionPage \
+PageRestorationErrorPage \
+SessionCreationErrorPage \
+SessionRestorationErrorPage
+
+GSWExtensions_COMPONENTS = $(addprefix GSW, \
+			     $(addsuffix .gswc, $(Extensions_COMPONENTS)))
+GSWExtensions_COMPONENTS += GSWRedirect.gswc
+
+WOExtensions_COMPONENTS =  $(addprefix WO, \
+			     $(addsuffix .wo, $(Extensions_COMPONENTS)))
 
 GSWExtensions_LANGUAGES = \
 French
-GSWExtensions_wo_LANGUAGES = $(GSWExtensions_LANGUAGES)
+
+GSWExtensions_LOCALIZED_RESOURCE_FILES = $(addprefix GSW, \
+		$(addsuffix .gswc, $(Extensions_LOCALIZED_RESOURCE_FILES)))
+
+WOExtensions_LOCALIZED_RESOURCE_FILES = $(addprefix WO, \
+		$(addsuffix .wo, $(Extensions_LOCALIZED_RESOURCE_FILES)))
+
+WOExtensions_LANGUAGES = $(GSWExtensions_LANGUAGES)
+
+WO_LOCALIZED_COMPONENTS = \
+	$(addprefix French.lproj/, $(WOExtensions_LOCALIZED_RESOURCE_FILES))
 
 GSWExtensions_RESOURCE_DIRS = 
-GSWExtensions_wo_RESOURCE_DIRS = $(GSWExtensions_RESOURCE_DIRS)
+WOExtensions_RESOURCE_DIRS = $(GSWExtensions_RESOURCE_DIRS)
 
 GSWExtensions_WEBSERVER_RESOURCE_FILES = \
 Ascending.png \
@@ -116,7 +138,8 @@ gswapp.png \
 gswappsrv.png \
 warning.mng \
 error.mng
-GSWExtensions_wo_WEBSERVER_RESOURCE_FILES = $(GSWExtensions_WEBSERVER_RESOURCE_FILES)
+WOExtensions_WEBSERVER_RESOURCE_FILES = \
+	$(GSWExtensions_WEBSERVER_RESOURCE_FILES)
 
 # The Objective-C source files to be compiled
 GSWExtensions_OBJC_FILES = \
@@ -133,7 +156,7 @@ GSWLongResponsePage.m \
 GSWKeyValueConditional.m \
 
 #GSWCompletionBar.m
-GSWExtensions_wo_OBJC_FILES = $(GSWExtensions_OBJC_FILES)
+WOExtensions_OBJC_FILES = $(GSWExtensions_OBJC_FILES)
 
 # The header files to be installed
 GSWExtensions_HEADER_FILES = \
@@ -159,7 +182,7 @@ GSWKeyValueConditional.h \
 #GSWSimpleArrayDisplay.h
 #GSWSimpleArrayDisplay2.h
 #GSWBatchNavigationBar.h
-GSWExtensions_wo_HEADER_FILES = $(GSWExtensions_HEADER_FILES)
+WOExtensions_HEADER_FILES = $(GSWExtensions_HEADER_FILES)
 
 WO_HEADER_FILES = \
 	WOLongResponsePage.h \
@@ -168,8 +191,7 @@ WO_HEADER_FILES = \
 # WOExtensions.h not needed as it gets copied explicitly
 
 GSWExtensions_HEADER_FILES_DIR = $(HEADER_DIR)
-GSWExtensions_wo_HEADER_FILES_DIR = $(HEADER_DIR)
-GSWExtensions_wo_HEADER_FILES_INSTALL_DIR = WOExtensions
+WOExtensions_HEADER_FILES_DIR = $(HEADER_DIR)
 
 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
@@ -177,7 +199,8 @@ HDRS = $(LIBRARY_NAME:=.h)
 GSWExtensions_AUTOGSDOC_HEADERS = $(GSWExtensions_HEADER_FILES)
 GSWExtensions_AUTOGSDOC_SOURCE = $(GSWExtensions_OBJC_FILES)
 DOCUMENT_NAME = GSWExtensions
-GSWExtensions_AGSDOC_FILES = gswextensions.gsdoc $(GSWExtensions_AUTOGSDOC_HEADERS) 
+GSWExtensions_AGSDOC_FILES = gswextensions.gsdoc \
+	$(GSWExtensions_AUTOGSDOC_HEADERS) 
 #$(GSWExtensions_AUTOGSDOC_SOURCE)
 GSWExtensions_AGSDOC_FLAGS = \
 	-Declared Foundation \
diff --git a/GSWExtensions.framework/GSWExceptionPage.m b/GSWExtensions.framework/GSWExceptionPage.m
index 8716a0a..470ccc6 100644
--- a/GSWExtensions.framework/GSWExceptionPage.m
+++ b/GSWExtensions.framework/GSWExceptionPage.m
@@ -88,7 +88,6 @@ RCS_ID("$Id$")
 -(void)setException:(NSException*)exception
 {
   ASSIGN(_exception,exception);
-  NSDebugMLog(@"_exception=%@",_exception);
   NSDebugMLog(@"_exception name=%@",[_exception name]);
   NSDebugMLog(@"_exception reason=%@",[_exception reason]);
   NSDebugMLog(@"_exception userInfo=%@",[_exception userInfo]);
diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd b/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd
index 3536c28..60647f6 100644
--- a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd
+++ b/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd
@@ -1 +1,17 @@
-#include "GSWSessionRestorationErrorPage"
+ExclamationImage: GSWImage
+{
+    filename = "exclamation.mng";
+    framework = "GSWExtensions";
+    border = 0;
+}
+
+ApplicationNameString: GSWString
+{
+    value = application.name;
+}
+
+ReenterHyperlink: GSWHyperlink
+{
+    pageName = "";
+    target = "_top";
+}
diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswd b/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswd
deleted file mode 100644
index 60647f6..0000000
--- a/GSWExtensions.framework/GSWSessionRestorationErrorPage.gswd
+++ /dev/null
@@ -1,17 +0,0 @@
-ExclamationImage: GSWImage
-{
-    filename = "exclamation.mng";
-    framework = "GSWExtensions";
-    border = 0;
-}
-
-ApplicationNameString: GSWString
-{
-    value = application.name;
-}
-
-ReenterHyperlink: GSWHyperlink
-{
-    pageName = "";
-    target = "_top";
-}
diff --git a/GSWExtensions.framework/Makefile.postamble b/GSWExtensions.framework/Makefile.postamble
index 05f6df1..6517f72 100644
--- a/GSWExtensions.framework/Makefile.postamble
+++ b/GSWExtensions.framework/Makefile.postamble
@@ -32,7 +32,9 @@
 #
 
 # Things to do before compiling
-# before-all::
+ifneq ($(gswnames),gsw)
+before-all:: $(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS)
+endif
 
 # Things to do after compiling
 # after-all::
@@ -41,7 +43,9 @@
 # before-install::
 
 # Things to do after installing
-after-install:: install-WO-headers
+ifneq ($(gswnames),gsw)
+after-install:: WO-install-headers
+endif
 
 # Things to do before uninstalling
 # before-uninstall::
@@ -67,7 +71,9 @@ gsdocs:
 # before-clean::
 
 # Things to do after cleaning
-# after-clean::
+ifneq ($(gswnames),gsw)
+after-clean:: WO-components-clean
+endif
 
 # Things to do before distcleaning
 # before-distclean::
@@ -81,16 +87,57 @@ gsdocs:
 # Things to do after checking
 # after-check::
 
-ifneq ($(gswnames),gsw)
-install-WO-headers : 
-	$(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
-	$(EC)$(INSTALL_DATA) ./WOExtensions.h \
-	    $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR)/WOExtensions.h; \
-	cd $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR); \
-	pwd;\
+# An sed script to convert the classes refered to in .gswd files
+# from their GSW- to their WO-representations based on the mappings
+# contained in the GSWWOCompatibility.h header.
+# Currently this script is rather aggresive as it doesn't identify
+# whole words but merely patterns.
+GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h
+	$(ECHO_NOTHING)grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \
+	    ../GSWeb.framework/GSWWOCompatibility.h | \
+	  sed -e 's/#define /s\//' \
+	      -e 's/[[:space:]*]/\//' \
+	      -e 's/[[:space:]*]//g' \
+	      -e 's/$$/\//' > $@ ; \
+	echo "s/GSWExtensions/WOExtensions/g" >> $@ ;$(END_ECHO)
+
+# The script is copied instead of referenced as the relative path
+# from the $@ directory is unknown.  Keep this rule in sync with
+# GSWExtensionsGSW.framework/Makefile.postamble
+$(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS): GSWWOReplaceScript.sed
+	$(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \
+	cp GSWWOReplaceScript.sed $@ && \
+	cd $@ && ( \
+	  for I in *.gswd __done ; do \
+	    if [ $$I != __done ] ; then \
+	      sed -f GSWWOReplaceScript.sed $$I > \
+	        `echo $$I | sed "s/gswd$$/wod/"` \
+	        && rm -f $$I ; \
+	    fi ; \
+	  done ; \
+	  rm -rf CVS GSWWOReplaceScript.sed ; \
+	  for I in *.gswi __done ; do \
+	    if [ $$I != __done ] ; then \
+	      mv $$I `echo $$I | sed "s/gswi$$/woo/"` ; \
+	    fi ; \
+	  done ; \
+	  for I in GSW* __done ; do \
+	    if [ $$I != __done ] ; then \
+	      mv $$I `echo $$I | sed "s/^GSW/WO/"` ; \
+	    fi ; \
+	  done ) ;$(END_ECHO)
+
+WO-install-headers : 
+	$(ECHO_NOTHING)$(INSTALL_DATA) ./WOExtensions.h \
+	    $(GNUSTEP_HEADERS)/WOExtensions/WOExtensions.h ; \
+	cd $(GNUSTEP_HEADERS)/WOExtensions ; \
 	for file in $(WO_HEADER_FILES) ; do \
 	  $(LN_S) -f WOExtensions.h $$file; \
-	done;$(ECHO_END)
-else
-install-WO-headers: ;
-endif
+	done;$(END_ECHO)
+
+WO-components-clean:
+	$(ECHO_NOTHING)rm -rf $(WOExtensions_COMPONENTS) ; \
+	rm -rf $(WO_LOCALIZED_COMPONENTS) ; \
+	rm -f GSWWOReplaceScript.sed ;$(END_ECHO)
+
+
diff --git a/GSWExtensions.framework/Makefile.preamble b/GSWExtensions.framework/Makefile.preamble
index 23e242c..a0f7c2d 100644
--- a/GSWExtensions.framework/Makefile.preamble
+++ b/GSWExtensions.framework/Makefile.preamble
@@ -64,23 +64,27 @@ ADDITIONAL_INCLUDE_DIRS = \
 	-I../GSWeb.framework/derived_src
 
 # Additional LDFLAGS to pass to the linker
-ifeq ($(debug), yes)
-	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lGSANTLR_d
-else
-        ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lGSANTLR 
-endif
+ADDITIONAL_LDFLAGS = 
 
-GSWExtensions_ADDITIONAL_LDFLAGS = GSWeb
-GSWExtensions_wo_ADDITIONAL_LDFLAGS = GSWeb_wo
+# These variables should only be needed on windows
+# but they aren't set yet.
 
-#-lgnustep-xraw
+LIBRARIES_DEPEND_UPON += 
+#	-l$(FOUNDATION_LIBRARY_NAME) \
+#	-l$(EOCONTROL_LIBRARY_NAME) \
+#	-l$(EOACCESS_LIBRARY_NAME) \
+
+
+GSWExtentions_LIBRARIES_DEPEND_UPON += -lGSWeb
+WOExtentions_LIBRARIES_DEPEND_UPON += -lWebObjects
 
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS = 
 GSWExtentions_ADDITIONAL_LIB_DIRS = \
-        -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
-GSWExtentions_wo_ADDITIONAL_LIB_DIRS = \
-        -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb_wo
+	-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
+WOExtentions_ADDITIONAL_LIB_DIRS = \
+	-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/WebObjects
+
 
 #
 # Flags dealing with installing and uninstalling
diff --git a/GSWExtensionsGSW.framework/GNUmakefile b/GSWExtensionsGSW.framework/GNUmakefile
index 94bb574..6357c47 100644
--- a/GSWExtensionsGSW.framework/GNUmakefile
+++ b/GSWExtensionsGSW.framework/GNUmakefile
@@ -39,10 +39,10 @@ ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWExtensionsGSW
 endif
 ifeq ($(gswnames), wo)
-FRAMEWORK_NAME = GSWExtensionsGSW_wo
+FRAMEWORK_NAME = WOExtensionsGSW
 endif
 ifeq ($(gswnames), all)
-FRAMEWORK_NAME = GSWExtensionsGSW GSWExtensionsGSW_wo
+FRAMEWORK_NAME = GSWExtensionsGSW WOExtensionsGSW
 endif
 
 # Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC
@@ -51,31 +51,37 @@ GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE)
 DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
 endif
 
-GSWExtensionsGSW_wo_CPPFLAGS = -DGSWEB_WONAMES
+WOExtensionsGSW_CPPFLAGS = -DGSWEB_WONAMES
 
 # The framework resource files and directories
 GSWExtensionsGSW_RESOURCE_FILES = \
 Resources/Info-gnustep.plist
-GSWExtensionsGSW_wo_RESOURCE_FILES = $(GSWExtensionsGSW_RESOURCE_FILES)
+WOExtensionsGSW_RESOURCE_FILES = $(GSWExtensionsGSW_RESOURCE_FILES)
 
-GSWExtensionsGSW_COMPONENTS= \
-GSWTabComponent.gswc \
-GSWValidationFailureComponent.gswc \
-GSWLogin.gswc \
-GSWSimpleFormComponent.gswc \
-GSWFileUploadFormComponent.gswc \
-GSWFileUploadComponent.gswc
-GSWExtensionsGSW_wo_COMPONENTS = $(GSWExtensionsGSW_COMPONENTS)
+ExtensionsGSW_COMPONENTS= \
+TabComponent \
+ValidationFailureComponent \
+Login \
+SimpleFormComponent \
+FileUploadFormComponent \
+FileUploadComponent
+
+GSWExtensionsGSW_COMPONENTS = $(addprefix GSW, \
+			       $(addsuffix .gswc, $(ExtensionsGSW_COMPONENTS)))
+
+WOExtensionsGSW_COMPONENTS =  $(addprefix WO, \
+			       $(addsuffix .wo, $(ExtensionsGSW_COMPONENTS)))
 
 GSWExtensionsGSW_LANGUAGES= \
 French
-GSWExtensionsGSW_wo_LANGUAGES = $(GSWExtensionsGSW_LANGUAGES)
+WOExtensionsGSW_LANGUAGES = $(GSWExtensionsGSW_LANGUAGES)
 
 GSWExtensionsGSW_RESOURCE_DIRS = 
-GSWExtensionsGSW_wo_RESOURCE_DIRS = $(GSWExtensionsGSW_RESOURCE_DIRS)
+WOExtensionsGSW_RESOURCE_DIRS = $(GSWExtensionsGSW_RESOURCE_DIRS)
 
 GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES = 
-GSWExtensionsGSW_wo_WEBSERVER_RESOURCE_FILES = $(GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES)
+WOExtensionsGSW_WEBSERVER_RESOURCE_FILES = \
+	$(GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES)
 
 # The Objective-C source files to be compiled
 GSWExtensionsGSW_OBJC_FILES = \
@@ -85,7 +91,7 @@ GSWValidationFailureComponent.m \
 GSWSimpleFormComponent.m \
 GSWFileUploadFormComponent.m \
 GSWFileUploadComponent.m 
-GSWExtensionsGSW_wo_OBJC_FILES = $(GSWExtensionsGSW_OBJC_FILES)
+WOExtensionsGSW_OBJC_FILES = $(GSWExtensionsGSW_OBJC_FILES)
 
 # The header files to be installed
 GSWExtensionsGSW_HEADER_FILES = \
@@ -95,10 +101,10 @@ GSWTabComponent.h \
 GSWValidationFailureComponent.h \
 GSWFileUploadFormComponent.h \
 GSWFileUploadComponent.h
-GSWExtensionsGSW_wo_HEADER_FILES = $(GSWExtensionsGSW_HEADER_FILES)
+WOExtensionsGSW_HEADER_FILES = $(GSWExtensionsGSW_HEADER_FILES)
 
 GSWExtensionsGSW_HEADER_FILES_DIR = $(HEADER_DIR)
-GSWExtensionsGSW_wo_HEADER_FILES_DIR = $(GSWExtensionsGSW_HEADER_FILES_DIR)
+WOExtensionsGSW_HEADER_FILES_DIR = $(GSWExtensionsGSW_HEADER_FILES_DIR)
 
 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
@@ -107,7 +113,9 @@ GSWExtensionsGSW_AUTOGSDOC_HEADERS = $(GSWExtensionsGSW_HEADER_FILES)
 GSWExtensionsGSW_AUTOGSDOC_SOURCE = $(GSWExtensionsGSW_OBJC_FILES)
 DOCUMENT_NAME = GSWExtensionsGSW
 
-GSWExtensionsGSW_AGSDOC_FILES = gswextensionsgsw.gsdoc $(GSWExtensionsGSW_AUTOGSDOC_HEADERS) 
+GSWExtensionsGSW_AGSDOC_FILES = \
+	gswextensionsgsw.gsdoc $(GSWExtensionsGSW_AUTOGSDOC_HEADERS) 
+
 #$(GSWExtensionsGSW_AUTOGSDOC_SOURCE)
 GSWExtensionsGSW_AGSDOC_FLAGS = \
 	-Declared Foundation \
diff --git a/GSWExtensionsGSW.framework/Makefile.postamble b/GSWExtensionsGSW.framework/Makefile.postamble
index 9184a81..4e708d0 100644
--- a/GSWExtensionsGSW.framework/Makefile.postamble
+++ b/GSWExtensionsGSW.framework/Makefile.postamble
@@ -1,5 +1,5 @@
-#
-#  Makefile.postamble
+#   -*-makefile-*-
+#   Makefile.postamble
 #
 #   Copyright (C) 1999 Free Software Foundation, Inc.
 #   
@@ -33,7 +33,9 @@
 #
 
 # Things to do before compiling
-# before-all::
+ifneq ($(gswnames),gsw)
+before-all:: $(WOExtensionsGSW_COMPONENTS)
+endif
 
 # Things to do after compiling
 # after-all::
@@ -66,7 +68,9 @@ gsdocs:
 # before-clean::
 
 # Things to do after cleaning
-# after-clean::
+ifneq ($(gswnames),gsw)
+after-clean:: WO-components-clean
+endif
 
 # Things to do before distcleaning
 # before-distclean::
@@ -80,3 +84,47 @@ gsdocs:
 # Things to do after checking
 # after-check::
 
+# Currently this script is rather aggresive as it doesn't identify
+# whole words but merely patterns.
+GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h
+	$(ECHO_NOTHING) \
+	grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \
+	    ../GSWeb.framework/GSWWOCompatibility.h | \
+	  sed -e 's/#define /s\//' \
+	      -e 's/[[:space:]*]/\//' \
+	      -e 's/[[:space:]*]//g' \
+	      -e 's/$$/\//' > $@ ; \
+	echo "s/GSWExtensionsGSW/WOExtensionsGSW/g" >> $@ ; \
+	$(END_ECHO)
+
+# The script is copied instead of referenced as the relative path
+# from the $@ directory is unknown.  Keep this rule in sync with
+# GSWExtensions.framework/Makefile.postamble
+$(WOExtensionsGSW_COMPONENTS): GSWWOReplaceScript.sed
+	$(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \
+	cp GSWWOReplaceScript.sed $@ && \
+	cd $@ && ( \
+	  for I in *.gswd __done ; do \
+	    if [ $$I != __done ] ; then \
+	      sed -f GSWWOReplaceScript.sed $$I > \
+	        `echo $$I | sed "s/gswd$$/wod/"` \
+	        && rm -f $$I ; \
+	    fi ; \
+	  done ; \
+	  rm -rf CVS GSWWOReplaceScript.sed ; \
+	  for I in *.gswi __done ; do \
+	    if [ $$I != __done ] ; then \
+	      mv $$I `echo $$I | sed "s/gswi$$/woo/"` ; \
+	    fi ; \
+	  done ; \
+	  for I in GSW* __done ; do \
+	    if [ $$I != __done ] ; then \
+	      mv $$I `echo $$I | sed "s/^GSW/WO/"` ; \
+	    fi ; \
+	  done ) ;$(END_ECHO)
+
+WO-components-clean:
+	$(ECHO_NOTHING) \
+	rm -rf $(WOExtensionsGSW_COMPONENTS) ; \
+	rm -f GSWWOReplaceScript.sed ; \
+	$(END_ECHO)
diff --git a/GSWExtensionsGSW.framework/Makefile.preamble b/GSWExtensionsGSW.framework/Makefile.preamble
index 40955e6..10145e8 100644
--- a/GSWExtensionsGSW.framework/Makefile.preamble
+++ b/GSWExtensionsGSW.framework/Makefile.preamble
@@ -64,23 +64,20 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I../GSWeb.framework/derived_src
 
 # Additional LDFLAGS to pass to the linker
-ifeq ($(debug), yes)
-	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lGSANTLR_d
-else
-        ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lGSANTLR 
-endif
-
-GSWExtensionsGSW_ADDITIONAL_LDFLAGS = -lGSWeb
-GSWExtensionsGSW_wo_ADDITIONAL_LDFLAGS = -lGSWeb_wo
+ADDITIONAL_LDFLAGS = 
 
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS = 
-GSWExtensionsGSW_ADDITIONAL_LIB_DIRS = \
-        -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
-GSWExtensionsGSW_wo_ADDITIONAL_LIB_DIRS = \
-        -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb_wo
+GSWExtensionsGSW_ADDITIONAL_LIB_DIRS += \
+	-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
+WOExtensionsGSW_ADDITIONAL_LIB_DIRS += \
+	-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/WebObjects
 
 
+LIBRARIES_DEPEND_UPON = 
+GSWExtentions_LIBRARIES_DEPEND_UPON += -lGSWeb
+WOExtentions_LIBRARIES_DEPEND_UPON += -lWebObjects
+
 #
 # Flags dealing with installing and uninstalling
 #
diff --git a/GSWeb.framework/GNUmakefile b/GSWeb.framework/GNUmakefile
index 8427af1..63b4325 100644
--- a/GSWeb.framework/GNUmakefile
+++ b/GSWeb.framework/GNUmakefile
@@ -39,10 +39,10 @@ ifeq ($(gswnames), gsw)
 FRAMEWORK_NAME = GSWeb
 endif
 ifeq ($(gswnames), wo)
-FRAMEWORK_NAME = GSWeb_wo
+FRAMEWORK_NAME = WebObjects
 endif
 ifeq ($(gswnames), all)
-FRAMEWORK_NAME = GSWeb GSWeb_wo
+FRAMEWORK_NAME = GSWeb WebObjects
 endif
 
 # Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC
@@ -51,7 +51,7 @@ GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE)
 DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
 endif
 
-GSWeb_wo_CPPFLAGS = -DGSWEB_WONAMES
+WebObjects_CPPFLAGS = -DGSWEB_WONAMES
 
 # DTDs to install
 srcDTDDir = DTDs
@@ -70,10 +70,10 @@ GSWeb_RESOURCE_FILES = \
 Resources/MIME.plist \
 Resources/languages.plist \
 DTDs
-GSWeb_wo_RESOURCE_FILES = $(GSWeb_RESOURCE_FILES)
+WebObjects_RESOURCE_FILES = $(GSWeb_RESOURCE_FILES)
 
 GSWeb_RESOURCE_DIRS = DTDs
-GSWeb_wo_RESOURCE_DIRS = $(GSWeb_RESOURCE_DIRS)
+WebObjects_RESOURCE_DIRS = $(GSWeb_RESOURCE_DIRS)
 
 # The framework libraries to link against
 #GSWeb_GSWBUNDLE_LIBS = 
@@ -206,7 +206,7 @@ GSWActionURL.m \
 #GSWMonitorXMLCoder.m \
 #GSWMonitorXMLDecoder.m \
 
-GSWeb_wo_OBJC_FILES = $(GSWeb_OBJC_FILES)
+WebObjects_OBJC_FILES = $(GSWeb_OBJC_FILES)
 
 
 # The framework installed header files
@@ -342,7 +342,7 @@ GSWActionURL.h \
 #GSWMonitorXMLDecoder.h \
 
 # The framework installed WO header files
-GSWeb_wo_HEADER_FILES = $(GSWeb_HEADER_FILES)
+WebObjects_HEADER_FILES = $(GSWeb_HEADER_FILES)
 
 WO_HEADER_FILES = \
 	WOAdaptor.h \
@@ -368,8 +368,7 @@ WO_HEADER_FILES = \
 
 
 GSWeb_HEADER_FILES_DIR = $(HEADER_DIR)
-GSWeb_wo_HEADER_FILES_DIR = $(HEADER_DIR)
-GSWeb_wo_HEADER_FILES_INSTALL_DIR = WebObjects
+WebObjects_HEADER_FILES_DIR = $(HEADER_DIR)
 
 SRCS = $(LIBRARY_NAME:=.m)
 HDRS = $(LIBRARY_NAME:=.h)
diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m
index 01575f1..67c7155 100644
--- a/GSWeb.framework/GSWApplication.m
+++ b/GSWeb.framework/GSWApplication.m
@@ -3506,17 +3506,10 @@ to another instance **/
   NSDebugMLog(@"EXCEPTION=%@",anException);
   NS_DURING
     {
-//
-//      response=[self _handleErrorWithPageNamed:GSWExceptionPageName[GSWebNamingConv]
-//                     exception:anException
-//                     inContext:aContext];
-// we have only GSWExceptionPage until now
-
-      response=[self _handleErrorWithPageNamed:GSWExceptionPageName[0]
-                     exception:anException
-                     inContext:aContext];
-
-
+      response = 
+	[self _handleErrorWithPageNamed: GSWExceptionPageName[GSWebNamingConv]
+	      exception: anException
+	      inContext: aContext];
     }
   NS_HANDLER
     {
diff --git a/GSWeb.framework/GSWResourceManager.m b/GSWeb.framework/GSWResourceManager.m
index fec7318..5b66a62 100644
--- a/GSWeb.framework/GSWResourceManager.m
+++ b/GSWeb.framework/GSWResourceManager.m
@@ -1155,7 +1155,7 @@ bundle if none is found
   NS_HANDLER
     {
       NSDebugMLLog(@"resmanager",@"EXCEPTION:%@ (%@) [%s %d]",
-                   localException,[localException reason],__FILE__,__LINE__);
+		   localException,[localException reason],__FILE__,__LINE__);
       //TODO
       [self unlock];
       [localException raise];
diff --git a/GSWeb.framework/GSWWOCompatibility.h b/GSWeb.framework/GSWWOCompatibility.h
index f598a59..1de994d 100644
--- a/GSWeb.framework/GSWWOCompatibility.h
+++ b/GSWeb.framework/GSWWOCompatibility.h
@@ -141,6 +141,7 @@
 #define GSWDictionaryRepetition         WODictionaryRepetition
 #define GSWEventDisplayPage             WOEventDisplayPage
 #define GSWEventSetupPage               WOEventSetupPage
+#define GSWExceptionPage                WOExceptionPage
 #define GSWIFrame                       WOIFrame
 #define GSWKeyValueConditional          WOKeyValueConditional
 #define GSWLongResponsePage             WOLongResponsePage
diff --git a/GSWeb.framework/Makefile.postamble b/GSWeb.framework/Makefile.postamble
index 1486db9..1416103 100644
--- a/GSWeb.framework/Makefile.postamble
+++ b/GSWeb.framework/Makefile.postamble
@@ -88,8 +88,8 @@ $(GNUSTEP_TARGET_DIR)/config.h: ../config.status
 ifneq ($(gswnames),gsw)
 install-WO-headers : 
 	$(EC)$(INSTALL_DATA) ./WebObjects/WebObjects.h \
-	    $(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/$(GSWeb_wo_HEADER_FILES_INSTALL_DIR)/WebObjects.h; \
-	cd $(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/$(GSWeb_wo_HEADER_FILES_INSTALL_DIR); \
+	    $(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/WebObjects/WebObjects.h ; \
+	cd $(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/WebObjects ; \
 	for file in $(WO_HEADER_FILES) ; do \
 	  $(LN_S) -f WebObjects.h $$file; \
 	done;$(ECHO_END)
diff --git a/gsweb.make.in b/gsweb.make.in
index eabb6af..cf47d5d 100644
--- a/gsweb.make.in
+++ b/gsweb.make.in
@@ -29,10 +29,11 @@ GSWEB_MINOR_VERSION = @MINOR_VERSION@
 GSWEB_SUBMINOR_VERSION = @SUBMINOR_VERSION@
 
 ifeq ($(GSW_NAMES),wo)
-     GSWEXT = _wo
+  AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions -lWOExtensionsGSW
+else
+  AUXILIARY_GSW_LIBS += -lGSWeb -lGSWExtensions -lGSWExtensionsGSW
 endif
 
-AUXILIARY_GSW_LIBS += -lGSWeb$(GSWEXT) -lGSWExtensions$(GSWEXT) -lGSWExtensionsGSW$(GSWEXT)
 
 AUXILIARY_INCLUDE_DIRS += @AUX_INCS@
 AUXILIARY_TOOL_LIBS += @AUX_LIBS@ -lGSANTLR