diff --git a/README.md b/README.md
index 19194f9..1ab73c6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ nimforum
 
 This is Nimrod's forum. The code depends on the RST parser of the Nimrod
 compiler and on Jester. The code generating captchas for registration uses the
-[cairo module](http://nimrod-code.org/cairo.html), which requires you to have
+[cairo module](http://nimrod-lang.org/cairo.html), which requires you to have
 the [cairo library](http://cairographics.org) installed when you run the forum,
 or you will be greeted by a cryptic error message similar to:
 
diff --git a/forms.tmpl b/forms.tmpl
index 1ef6ac1..c74a0fe 100644
--- a/forms.tmpl
+++ b/forms.tmpl
@@ -152,7 +152,7 @@
     <input type="submit" name="previewBtn" value="Preview" />
     <input type="submit" name="postBtn" value="Submit" />
   
-    <a href="http://nimrod-code.org/rst.html">Syntax Cheatsheet</a>
+    <a href="http://nimrod-lang.org/rst.html">Syntax Cheatsheet</a>
   </form>
 </div>
 #end proc
diff --git a/main.tmpl b/main.tmpl
index 6b4036d..108532f 100644
--- a/main.tmpl
+++ b/main.tmpl
@@ -23,9 +23,9 @@
     </div>
 
     <div id="header">
-      <span>Nimrod's <a href="http://nimrod-code.org/">homepage</a></span>
-      <span><a href="http://nimrod-code.org/documentation.html">stable docs</a></span>
-      <span><a href="http://build.nimrod-code.org/docs/overview.html">development docs</a></span>
+      <span>Nimrod's <a href="http://nimrod-lang.org/">homepage</a></span>
+      <span><a href="http://nimrod-lang.org/documentation.html">stable docs</a></span>
+      <span><a href="http://build.nimrod-lang.org/docs/overview.html">development docs</a></span>
       <span><a href="https://github.com/Araq/Nimrod/issues">github issues</a></span>
       #if c.loggedIn:
         <a href="${frontQuery}logout" class="right">Logout</a>
@@ -76,7 +76,7 @@
     <div id="footerPush"></div>
   </div>
   <div id="footer">
-  <span>Written in <a href="http://nimrod-code.org/">Nimrod</a> using <a href="https://github.com/dom96/jester">Jester</a></span>
+  <span>Written in <a href="http://nimrod-lang.org/">Nimrod</a> using <a href="https://github.com/dom96/jester">Jester</a></span>
   <span> | <a href="https://github.com/nimrod-code/nimforum">Fork on Github</a></span>
   <span> | User contributions licensed under <a href="http://creativecommons.org/licenses/by-sa/3.0/">cc-wiki</a> with <a href="/license">attribution required</a></span>
   <span style="float:right;">Generated in ${int((epochTime()-c.startTime)*1000.0)}ms</span>
diff --git a/rst.txt b/rst.txt
index 15813a5..70bbd63 100644
--- a/rst.txt
+++ b/rst.txt
@@ -32,14 +32,14 @@ Plain text                        Result
 Links
 =====
 
-Links are either direct URLs like ``http://nimrod-code.org`` or written like 
+Links are either direct URLs like ``http://nimrod-lang.org`` or written like
 this::
   
-  `Nimrod <http://nimrod-code.org>`_
+  `Nimrod <http://nimrod-lang.org>`_
   
 Or like this::
 
-  `<http://nimrod-code.org>`_
+  `<http://nimrod-lang.org>`_
 
 
 Code blocks
diff --git a/static/license.rst b/static/license.rst
index 47e5762..15534b7 100644
--- a/static/license.rst
+++ b/static/license.rst
@@ -19,10 +19,10 @@ require that you:
 * **Visually indicate that the content is from the Nimrod Forum**. It doesn’t
   have to be obnoxious; a discreet text blurb is fine.
 * **Hyperlink directly to the original post** (e.g.,
-  http://forum.nimrod-code.org/t/186)
+  http://forum.nimrod-lang.org/t/186)
 * **Show the author names** for every post.
 * **Hyperlink each author name** directly back to their user profile page
-  (e.g., http://forum.nimrod-code.org/profile/Araq)
+  (e.g., http://forum.nimrod-lang.org/profile/Araq)
 
 By “directly”, we mean each hyperlink must point directly to our domain in
 standard HTML visible even with JavaScript disabled, and not use a tinyurl or
@@ -38,5 +38,5 @@ Feel free to remix and reuse to your heart’s content, as long as a good faith
 effort is made to attribute the content!
 
 Content previous to the forum license change of
-http://forum.nimrod-code.org/t/186 remains under the original authors'
+http://forum.nimrod-lang.org/t/186 remains under the original authors'
 copyright, and therefore you cannot reuse it.