diff --git a/compiler/msgs.nim b/compiler/msgs.nim
index 62e6d52817..b58561d30b 100644
--- a/compiler/msgs.nim
+++ b/compiler/msgs.nim
@@ -460,7 +460,7 @@ type
 
   TLineInfo*{.final.} = object # This is designed to be as small as possible,
                                # because it is used
-                               # in syntax nodes. We safe space here by using 
+                               # in syntax nodes. We save space here by using 
                                # two int16 and an int32.
                                # On 64 bit and on 32 bit systems this is 
                                # only 8 bytes.
diff --git a/compiler/nim.nimrod.cfg b/compiler/nim.nim.cfg
similarity index 100%
rename from compiler/nim.nimrod.cfg
rename to compiler/nim.nim.cfg
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim
index a433bf98e4..711b476e65 100644
--- a/compiler/nimconf.nim
+++ b/compiler/nimconf.nim
@@ -14,7 +14,7 @@ import
   options, idents, wordrecg, strtabs
 
 # ---------------- configuration file parser -----------------------------
-# we use Nim's scanner here to safe space and work
+# we use Nim's scanner here to save space and work
 
 proc ppGetTok(L: var TLexer, tok: var TToken) = 
   # simple filter
@@ -158,7 +158,7 @@ proc checkSymbol(L: TLexer, tok: TToken) =
 proc parseAssignment(L: var TLexer, tok: var TToken) = 
   if tok.ident.id == getIdent("-").id or tok.ident.id == getIdent("--").id:
     confTok(L, tok)           # skip unnecessary prefix
-  var info = getLineInfo(L, tok) # safe for later in case of an error
+  var info = getLineInfo(L, tok) # save for later in case of an error
   checkSymbol(L, tok)
   var s = tokToStr(tok)
   confTok(L, tok)             # skip symbol
@@ -252,6 +252,11 @@ proc loadConfigs*(cfg: string) =
     
     if gProjectName.len != 0:
       # new project wide config file:
-      let projectConfig = changeFileExt(gProjectFull, "nim.cfg")
-      if fileExists(projectConfig): readConfigFile(projectConfig)
-      else: readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))
+      var projectConfig = changeFileExt(gProjectFull, "nimcfg")
+      if not fileExists(projectConfig):
+        projectConfig = changeFileExt(gProjectFull, "nim.cfg")
+      if not fileExists(projectConfig):
+        projectConfig = changeFileExt(gProjectFull, "nimrod.cfg")
+        if fileExists(projectConfig):
+          rawMessage(warnDeprecated, projectConfig)
+      readConfigFile(projectConfig)
diff --git a/koch.nimrod.cfg b/koch.nim.cfg
similarity index 100%
rename from koch.nimrod.cfg
rename to koch.nim.cfg
diff --git a/lib/nimrtl.nimrod.cfg b/lib/nimrtl.nim.cfg
similarity index 100%
rename from lib/nimrtl.nimrod.cfg
rename to lib/nimrtl.nim.cfg
diff --git a/lib/pure/asyncdispatch.nimrod.cfg b/lib/pure/asyncdispatch.nim.cfg
similarity index 100%
rename from lib/pure/asyncdispatch.nimrod.cfg
rename to lib/pure/asyncdispatch.nim.cfg
diff --git a/lib/pure/nimprof.nimrod.cfg b/lib/pure/nimprof.nim.cfg
similarity index 100%
rename from lib/pure/nimprof.nimrod.cfg
rename to lib/pure/nimprof.nim.cfg
diff --git a/lib/pure/smtp.nimrod.cfg b/lib/pure/smtp.nim.cfg
similarity index 100%
rename from lib/pure/smtp.nimrod.cfg
rename to lib/pure/smtp.nim.cfg
diff --git a/tests/dll/client.nimrod.cfg b/tests/dll/client.nim.cfg
similarity index 100%
rename from tests/dll/client.nimrod.cfg
rename to tests/dll/client.nim.cfg
diff --git a/tests/dll/server.nimrod.cfg b/tests/dll/server.nim.cfg
similarity index 100%
rename from tests/dll/server.nimrod.cfg
rename to tests/dll/server.nim.cfg