diff --git a/Moose Development/Moose/Message.lua b/Moose Development/Moose/Message.lua
index 625f73ec8..b55a48c6f 100644
--- a/Moose Development/Moose/Message.lua	
+++ b/Moose Development/Moose/Message.lua	
@@ -8,16 +8,16 @@
 -- 
 -- 1.1) MESSAGE construction methods
 -- ---------------------------------
--- Messages are created with MESSAGE:@{New}. Note that when the MESSAGE object is created, no message is sent yet.
+-- Messages are created with @{Message#MESSAGE.New}. Note that when the MESSAGE object is created, no message is sent yet.
 -- To send messages, you need to use the To functions.
 -- 
 -- 1.2) Send messages with MESSAGE To methods
 -- ------------------------------------------
 -- Messages are sent to:
 --
---   * Clients with MESSAGE:@{ToClient}().
---   * Coalitions with MESSAGE:@{ToCoalition}().
---   * All Players with MESSAGE:@{ToAll}().
+--   * Clients with @{Message#MESSAGE.ToClient}.
+--   * Coalitions with @{Message#MESSAGE.ToCoalition}.
+--   * All Players with @{Message#MESSAGE.ToAll}.
 --   
 -- @module Message
 -- @author FlightControl
diff --git a/Moose Training/Documentation/Message.html b/Moose Training/Documentation/Message.html
index c607ec0b0..b19eb8463 100644
--- a/Moose Training/Documentation/Message.html	
+++ b/Moose Training/Documentation/Message.html	
@@ -81,16 +81,16 @@ Messages are shown on the display panel for an amount of seconds, and will then
 Messages can contain a category which is indicating the category of the message.</p>
 
 <h2>1.1) MESSAGE construction methods</h2>
-<p>Messages are created with MESSAGE:<a href="New.html">New</a>. Note that when the MESSAGE object is created, no message is sent yet.
+<p>Messages are created with <a href="Message.html##(MESSAGE).New">Message#MESSAGE.New</a>. Note that when the MESSAGE object is created, no message is sent yet.
 To send messages, you need to use the To functions.</p>
 
 <h2>1.2) Send messages with MESSAGE To methods</h2>
 <p>Messages are sent to:</p>
 
 <ul>
-    <li>Clients with MESSAGE:<a href="ToClient.html">ToClient</a>().</li>
-    <li>Coalitions with MESSAGE:<a href="ToCoalition.html">ToCoalition</a>().</li>
-    <li>All Players with MESSAGE:<a href="ToAll.html">ToAll</a>().
+    <li>Clients with <a href="Message.html##(MESSAGE).ToClient">Message#MESSAGE.ToClient</a>.</li>
+    <li>Coalitions with <a href="Message.html##(MESSAGE).ToCoalition">Message#MESSAGE.ToCoalition</a>.</li>
+    <li>All Players with <a href="Message.html##(MESSAGE).ToAll">Message#MESSAGE.ToAll</a>.
     </li>
 </ul>