diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 889c9c79c6..437cc3b2d9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,22 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-05 20:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * source/codepage/cphuwins.c
+   * source/codepage/cphuiso.c
+   * source/codepage/cphuwin.c
+   * source/codepage/cphuisos.c
+     ! Fixed sloppy wording in comment. (Thanks Chen)
+
+   * common.mak
+   * source/codepage/Makefile
+   + source/codepage/cpgeiso.c
+   - source/codepage/cpgewin.c
+     * Renamed to ISO to be in sync with the actual codepage used.
+       (Thanks Chen)
+     ; Might be a good idea to readd the "real" WIN version to stay 
+       compatible. Anyone?
+
 2007-12-05 19:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * source/lang/msgnl.c
    * source/lang/msgelwin.c
diff --git a/harbour/common.mak b/harbour/common.mak
index 5b4b605f71..8d734c2d9c 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -768,7 +768,7 @@ CODEPAGE_LIB_OBJS = \
     $(OBJ_DIR)\cpeswin$(OBJEXT)  \
     $(OBJ_DIR)\cpfrdos$(OBJEXT)  \
     $(OBJ_DIR)\cpgedos$(OBJEXT)  \
-    $(OBJ_DIR)\cpgewin$(OBJEXT)  \
+    $(OBJ_DIR)\cpgeiso$(OBJEXT)  \
     $(OBJ_DIR)\cphr1250$(OBJEXT) \
     $(OBJ_DIR)\cphr437$(OBJEXT)  \
     $(OBJ_DIR)\cphr852$(OBJEXT)  \
diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile
index 974a18eb49..18b6cfedb8 100644
--- a/harbour/source/codepage/Makefile
+++ b/harbour/source/codepage/Makefile
@@ -21,7 +21,7 @@ C_SOURCES=\
 	cpesmwin.c    \
 	cpfrdos.c     \
 	cpgedos.c     \
-	cpgewin.c     \
+	cpgeiso.c     \
 	cphr1250.c    \
 	cphr437.c     \
 	cphr852.c     \
diff --git a/harbour/source/codepage/cpgewin.c b/harbour/source/codepage/cpgeiso.c
similarity index 94%
rename from harbour/source/codepage/cpgewin.c
rename to harbour/source/codepage/cpgeiso.c
index 9a565f4292..baad62738f 100644
--- a/harbour/source/codepage/cpgewin.c
+++ b/harbour/source/codepage/cpgeiso.c
@@ -4,7 +4,7 @@
 
 /*
  * Harbour Project source code:
- * National Collation Support Module ( German WIN )
+ * National Collation Support Module ( German ISO )
  *
  * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
  * www - http://www.harbour-project.org
@@ -84,16 +84,16 @@
    same excepting the characters case, of course.
  */
 
-static HB_CODEPAGE s_codepage = { "DEWIN",
+static HB_CODEPAGE s_codepage = { "DEISO",
     HB_CPID_8859_1, HB_UNITB_8859_1, NUMBER_OF_CHARACTERS,
     "AÄBCDEFGHIJKLMNOÖPQRSßTUÜVWXYZ",
     "aäbcdefghijklmnoöpqrsßtuüvwxyz",
     IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };
 
-HB_CODEPAGE_INIT( DEWIN )
+HB_CODEPAGE_INIT( DEISO )
 
 #if defined(HB_PRAGMA_STARTUP)
-   #pragma startup hb_codepage_Init_DEWIN
+   #pragma startup hb_codepage_Init_DEISO
 #elif defined(HB_MSC_STARTUP)
    #if _MSC_VER >= 1010
       #pragma data_seg( ".CRT$XIY" )
@@ -101,6 +101,6 @@ HB_CODEPAGE_INIT( DEWIN )
    #else
       #pragma data_seg( "XIY" )
    #endif
-   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_DEWIN = hb_codepage_Init_DEWIN;
+   static HB_$INITSYM hb_vm_auto_hb_codepage_Init_DEISO = hb_codepage_Init_DEISO;
    #pragma data_seg()
 #endif
diff --git a/harbour/source/codepage/cphuiso.c b/harbour/source/codepage/cphuiso.c
index 886aeaf048..1899ff3562 100644
--- a/harbour/source/codepage/cphuiso.c
+++ b/harbour/source/codepage/cphuiso.c
@@ -52,7 +52,7 @@
 
 /* Language name: Hungarian */
 /* ISO language code (2 chars): HU */
-/* Codepage: ISO-8859-2 (ntxhu852 compatible) */
+/* Codepage: ISO-8859-2 (ntxhu852 flavour) */
 
 #include <ctype.h>
 #include "hbapi.h"
diff --git a/harbour/source/codepage/cphuisos.c b/harbour/source/codepage/cphuisos.c
index 0227ab8da0..953d7049a6 100644
--- a/harbour/source/codepage/cphuisos.c
+++ b/harbour/source/codepage/cphuisos.c
@@ -52,7 +52,7 @@
 
 /* Language name: Hungarian */
 /* ISO language code (2 chars): HU */
-/* Codepage: ISO-8859-2 (sixhu852 compatible) */
+/* Codepage: ISO-8859-2 (sixhu852 flavour) */
 
 #include <ctype.h>
 #include "hbapi.h"
diff --git a/harbour/source/codepage/cphuwin.c b/harbour/source/codepage/cphuwin.c
index 2bb4776a11..75022cbd15 100644
--- a/harbour/source/codepage/cphuwin.c
+++ b/harbour/source/codepage/cphuwin.c
@@ -52,7 +52,7 @@
 
 /* Language name: Hungarian */
 /* ISO language code (2 chars): HU */
-/* Codepage: Windows-1250 (ntxhu852 compatible) */
+/* Codepage: Windows-1250 (ntxhu852 flavour) */
 
 #include <ctype.h>
 #include "hbapi.h"
diff --git a/harbour/source/codepage/cphuwins.c b/harbour/source/codepage/cphuwins.c
index cebe0b0053..a177940c92 100644
--- a/harbour/source/codepage/cphuwins.c
+++ b/harbour/source/codepage/cphuwins.c
@@ -52,7 +52,7 @@
 
 /* Language name: Hungarian */
 /* ISO language code (2 chars): HU */
-/* Codepage: Windows-1250 (sixhu852 compatible) */
+/* Codepage: Windows-1250 (sixhu852 flavour) */
 
 #include <ctype.h>
 #include "hbapi.h"