--- source/preferences.c
+++ source/preferences.c
@@ -276,7 +276,7 @@
     int smartTags;  	    	/* look for tag in current window first */
     int alwaysCheckRelativeTagsSpecs; /* for every new opened file of session */
     int stickyCaseSenseBtn;     /* whether Case Word Btn is sticky to Regex Btn */
-    int prefFileRead;	    	/* detects whether a .nedit existed */
+    int prefFileRead;	    	/* detects whether a .desk/nedit existed */
     int backlightChars;		/* whether to apply character "backlighting" */
     char *backlightCharTypes;	/* the backlighting color definitions */
 #ifdef SGI_CUSTOM
@@ -308,7 +308,7 @@
     char serverName[MAXPATHLEN];/* server name for multiple servers per disp. */
     char bgMenuBtn[MAX_ACCEL_LEN]; /* X event description for triggering
     	    	    	    	      posting of background menu */
-    char fileVersion[6]; 	/* Version of nedit which wrote the .nedit
+    char fileVersion[6]; 	/* Version of nedit which wrote the .desk/nedit
     				   file we're reading */
     int findReplaceUsesSelection; /* whether the find replace dialog is automatically
                                      loaded with the primary selection */
@@ -787,7 +787,7 @@
         Lex:.lex:::::::\n\
         Makefile:Makefile makefile .gmk:::None:8:8::\n\
         Matlab:.m .oct .sci:::::::\n\
-        NEdit Macro:.nm .neditmacro:::::::\n\
+        NEdit Macro:.nm .desk/neditmacro:::::::\n\
         Pascal:.pas .p .int:::::::\n\
         Perl:.pl .pm .p5 .PL:\"^[ \\t]*#[ \\t]*!.*perl\":Auto:None:::\".,/\\\\`'!$@#%^&*()-=+{}[]\"\":;<>?~|\":\n\
         PostScript:.ps .eps .epsf .epsi:\"^%!\":::::\"/%(){}[]<>\":\n\
@@ -800,7 +800,7 @@
         VHDL:.vhd .vhdl .vdl:::::::\n\
         Verilog:.v:::::::\n\
         XML:.xml .xsl .dtd:\"\\<(?i\\?xml|!doctype)\"::None:::\"<>/=\"\"'()+*?|\":\n\
-        X Resources:.Xresources .Xdefaults .nedit .pats nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n\
+        X Resources:.Xresources .Xdefaults .desk/nedit .pats nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n\
         Yacc:.y::::::\".,/\\`'!|@#%^&*()-=+{}[]\"\":;<>?~\":",
 #endif
 	&TempStringPrefs.language, NULL, True},
@@ -1317,7 +1317,7 @@
         updateMacroCmdsTo5dot5();
     }
     if (PrefData.prefFileRead && (fileVer < 5006)) {
-        fprintf(stderr, "NEdit: Converting .nedit file to 5.6 version.\n"
+        fprintf(stderr, "NEdit: Converting .desk/nedit file to 5.6 version.\n"
                 "    To keep, use Preferences -> Save Defaults\n");
         updateMacroCmdsTo5dot6();
         updatePatternsTo5dot6();
@@ -1344,7 +1344,7 @@
 ** In addition this function covers settings that, while simple, require
 ** additional steps before they can be published.
 **
-** The argument convertOld attempts a conversion from pre 5.1 format .nedit
+** The argument convertOld attempts a conversion from pre 5.1 format .desk/nedit
 ** files (which means patterns and macros may contain regular expressions
 ** which are of the older syntax where braces were not quoted, and \0 was a
 ** legal substitution character).  Macros, so far can not be automatically
@@ -1502,7 +1502,7 @@
 
 /*
 ** Load an additional preferences file on top of the existing preferences
-** derived from defaults, the .nedit file, and X resources.
+** derived from defaults, the .desk/nedit file, and X resources.
 */
 void ImportPrefFile(const char *filename, int convertOld)
 {
@@ -5464,12 +5464,12 @@
     const char *pyLm5dot3 =
         "Python:\\.py:\"\\^#!\\.\\*python\":Auto:None::::?\n";
     const char *xrLm5dot3 =
-        "X Resources:\\.Xresources \\.Xdefaults \\.nedit:\"\\^\\[!#\\]\\.\\*\\(\\[Aa\\]pp\\|\\[Xx\\]\\)\\.\\*\\[Dd\\]efaults\"::::::?\n";
+        "X Resources:\\.Xresources \\.Xdefaults \\.desk/nedit:\"\\^\\[!#\\]\\.\\*\\(\\[Aa\\]pp\\|\\[Xx\\]\\)\\.\\*\\[Dd\\]efaults\"::::::?\n";
 
     const char *pyLm5dot4 = 
         "Python:.py:\"^#!.*python\":Auto:None:::\"!\"\"#$%&'()*+,-./:;<=>?@[\\\\]^`{|}~\":\n";
     const char *xrLm5dot4 =
-        "X Resources:.Xresources .Xdefaults .nedit nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n";
+        "X Resources:.Xresources .Xdefaults .desk/nedit nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n";
 #endif
 
     /* Upgrade modified language modes, only if the user hasn't
@@ -5493,8 +5493,8 @@
         "Csh:.csh .cshrc .tcshrc .login .logout:\"^[ \\t]*#[ \\t]*![ \\t]*/bin/t?csh\"::::::\n",
 	"LaTeX:\\.tex \\.sty \\.cls \\.ltx \\.ins:::::::\\n",
 	"LaTeX:.tex .sty .cls .ltx .ins .clo .fd:::::::\n",
-        "X Resources:\\.Xresources \\.Xdefaults \\.nedit:\"\\^\\[!#\\]\\.\\*\\(\\[Aa\\]pp\\|\\[Xx\\]\\)\\.\\*\\[Dd\\]efaults\"::::::\\n",
-        "X Resources:.Xresources .Xdefaults .nedit .pats nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n",
+        "X Resources:\\.Xresources \\.Xdefaults \\.desk/nedit:\"\\^\\[!#\\]\\.\\*\\(\\[Aa\\]pp\\|\\[Xx\\]\\)\\.\\*\\[Dd\\]efaults\"::::::\\n",
+        "X Resources:.Xresources .Xdefaults .desk/nedit .pats nedit.rc:\"^[!#].*([Aa]pp|[Xx]).*[Dd]efaults\"::::::\n",
 #else
 	"Csh:\\.csh \\.cshrc \\.login \\.logout:\"\\^\\[ \\\\t\\]\\*#\\[ \\\\t\\]\\*!\\[ \\\\t\\]\\*/bin/csh\"::::::\\n",
 	"Csh:.CSH .CSHRC .TCSHRC .LOGIN .LOGOUT:\"^[ \\t]*#[ \\t]*![ \\t]*/bin/t?csh\"::::::\n",