--- a/Make.spec	Tue Apr 24 16:58:43 2012 +0200
+++ b/Make.spec	Wed Apr 25 21:08:21 2012 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.129 2012-03-01 15:58:53 stefan Exp $
+# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.130 2012-04-25 19:08:21 stefan Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic at 2012-03-01 13:51:23.335.
@@ -426,9 +426,9 @@
     $(OUTDIR)BuiltinLookup.$(O) \
     $(OUTDIR)CachingRegistry.$(O) \
     $(OUTDIR)Character.$(O) \
-    $(OUTDIR)Encoder_ISO10646_1.$(O) \
-    $(OUTDIR)Encoder_SingleByteEncoder.$(O) \
-    $(OUTDIR)Encoder_TwoByteEncoder.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO10646_1.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__SingleByteEncoder.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__TwoByteEncoder.$(O) \
     $(OUTDIR)CompiledCode.$(O) \
     $(OUTDIR)ControlInterrupt.$(O) \
     $(OUTDIR)Date.$(O) \
@@ -462,14 +462,14 @@
     $(OUTDIR)UninterpretedBytes.$(O) \
     $(OUTDIR)Association.$(O) \
     $(OUTDIR)Block.$(O) \
-    $(OUTDIR)Encoder_ASCII.$(O) \
-    $(OUTDIR)Encoder_ISO10646_to_UTF8.$(O) \
-    $(OUTDIR)Encoder_ISO8859_1.$(O) \
-    $(OUTDIR)Encoder_ISO8859_15.$(O) \
-    $(OUTDIR)Encoder_ISO8859_2.$(O) \
-    $(OUTDIR)Encoder_ISO8859_5.$(O) \
-    $(OUTDIR)Encoder_ISO8859_7.$(O) \
-    $(OUTDIR)Encoder_MS_Ansi.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ASCII.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO10646_to_UTF8.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_1.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_15.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_2.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_5.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__ISO8859_7.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) \
     $(OUTDIR)ClassDescription.$(O) \
     $(OUTDIR)ControlRequest.$(O) \
     $(OUTDIR)Dictionary.$(O) \
@@ -668,9 +668,9 @@
 WIN32_OBJS= \
     $(OUTDIR)Win32Process.$(O) \
     $(OUTDIR)PCFilename.$(O) \
-    $(OUTDIR)Encoder_MS_Baltic.$(O) \
-    $(OUTDIR)Encoder_MS_Cyrillic.$(O) \
-    $(OUTDIR)Encoder_MS_Greek.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Baltic.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Cyrillic.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Greek.$(O) \
     $(OUTDIR)Win32Handle.$(O) \
     $(OUTDIR)Win32FILEHandle.$(O) \
     $(OUTDIR)Win32Constants.$(O) \