diff --git a/Editor-Support.md b/Editor-Support.md
index 0e1ec44..324c6cc 100644
--- a/Editor-Support.md
+++ b/Editor-Support.md
@@ -12,14 +12,14 @@ The following editors have some Nim support:
   * Syntax Highlighting
   * Auto-indent
   * Build/Jump to errors within Vim
-  * Project Navigation and Jump to Definition (using the Ctags support listed below or [Nimrod's idetools](http://build.nimrod-code.org/docs/idetools.html) command)
+  * Project Navigation and Jump to Definition (using the Ctags support listed below or [Nim's idetools](http://nim-lang.org/idetools.html) command)
 
 * http://gradha.github.io/articles/2014/02/invoking-dash-from-the-command-line-vim.html
 
   Instructions to map Vim's ``K`` letter to look up documentation under MacOSX using [Dash](http://forum.nim-lang.org/t/330).
 
 ### Scite
-Recent versions of Scite have out-of-the-box support for Nimrod. For older versions: <br />
+Recent versions of Scite have out-of-the-box support for Nim. For older versions: <br />
 http://sourceforge.net/p/scintilla/scite/ci/default/tree/src/nimrod.properties?format=raw
 
 ### Aporia
@@ -37,7 +37,7 @@ https://github.com/zah/nimrod.atom/
 There is a .lang file for gedit [here](https://github.com/nim-lang/Aporia/blob/master/share/gtksourceview-2.0/language-specs/nimrod.lang)
 
 ### Geany
-There is a [pull request](https://github.com/geany/geany/pull/193) to provide Nimrod support in [Geany](http://www.geany.org).
+There is a [pull request](https://github.com/geany/geany/pull/193) to provide Nim support in [Geany](http://www.geany.org).
 
 ### Ctags
 Basic ```~/.ctags``` rules for Nim code (Feel free to improve and contribute)