diff --git a/src/_archive/___x11.c b/src/_archive/x11.c
similarity index 100%
rename from src/_archive/___x11.c
rename to src/_archive/x11.c
diff --git a/src/_archive/___x11.h b/src/_archive/x11.h
similarity index 100%
rename from src/_archive/___x11.h
rename to src/_archive/x11.h
diff --git a/src/_archive/___x11_lcd.c b/src/_archive/x11_lcd.c
similarity index 100%
rename from src/_archive/___x11_lcd.c
rename to src/_archive/x11_lcd.c
diff --git a/src/_archive/___x11_lcd.h b/src/_archive/x11_lcd.h
similarity index 100%
rename from src/_archive/___x11_lcd.h
rename to src/_archive/x11_lcd.h
diff --git a/src/_archive/___x11_main.c b/src/_archive/x11_main.c
similarity index 100%
rename from src/_archive/___x11_main.c
rename to src/_archive/x11_main.c
diff --git a/src/main.c b/src/main.c
index 82c4a3c..6a7bc2d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,12 +41,9 @@ int main( int argc, char** argv )
 {
     config = *config_init( argc, argv );
 
-    /* Chf initialization with msgcat subsystem; notice that on
-           some systems (e.g. Digital UNIX) catopen() can succeed even
-           if it was not able to open the right message catalog;
-           better try it now.
-        */
-    if ( ( ChfStaticInit( argv[ 0 ],            /* Application's name */
+    /* Chf initialization with msgcat subsystem
+     */
+    if ( ( ChfStaticInit( config.progname,      /* Application's name */
                           CHF_DEFAULT,          /* Options */
                           message_table,        /* Name of the message catalog */
                           message_table_size,   /* message catalog size */