diff --git a/data/TWiki/LoginNameAliasesPlugin.txt b/data/TWiki/LoginNameAliasesPlugin.txt
index e4ac7e9..8e2e245 100644
--- a/data/TWiki/LoginNameAliasesPlugin.txt
+++ b/data/TWiki/LoginNameAliasesPlugin.txt
@@ -3,7 +3,7 @@
 
 This plugin is used to map login names (typically determined by the REMOTE_USER
 variable set by the web server) to usernames.  Most settings for the plugin are
-controlled on this page.  See TWiki.LoginNameAliasesPluginDoc for documentation on how to use the plugin and what these settings mean.
+controlled on this page.  See %SYSTEMWEB%.LoginNameAliasesPluginDoc for documentation on how to use the plugin and what these settings mean.
 
 
 *IMPORTANT: For security reasons, this page should only be editable by people in the %MAINWEB%.AdminGroup.*
diff --git a/data/TWiki/LoginNameAliasesPluginDoc.txt b/data/TWiki/LoginNameAliasesPluginDoc.txt
index 251c9de..a4629d9 100644
--- a/data/TWiki/LoginNameAliasesPluginDoc.txt
+++ b/data/TWiki/LoginNameAliasesPluginDoc.txt
@@ -15,7 +15,7 @@ on http://twiki.org. Proposed solutions have often involved making small changes
 designed to be used in a intranet environment where all registered users have both a !WikiName and a user name (which is often the same as a Unix or Windows username).
 
 ---++ Settings
-Behavior of this plugin is controlled through the following settings in the [[TWiki.LoginNameAliasesPlugin][TWiki.LoginNameAliasesPlugin]] topic.  *Important:* the settings topic will not be read if you have renamed your TWiki web or installed this topic in another web.
+Behavior of this plugin is controlled through the following settings in the [[%SYSTEMWEB%.LoginNameAliasesPlugin][%SYSTEMWEB%.LoginNameAliasesPlugin]] topic.  *Important:* the settings topic will not be read if you have renamed your TWiki web or installed this topic in another web.
 
 	* MAP_BLANK_USER = <user>
 	* USE_ALIASES = <boolean>
@@ -57,7 +57,7 @@ This is useful for debugging and keeping a record of user names before they are
 There are obvious security risks with allowing arbitrary user names to get mapped to arbitrary TWiki users. To mitigate these risks:
 	* The plugin does not do anything unless $useLoginNameAliasesPlugin is set
 	in TWiki.cfg.
-	* The plugin configuration topic, [[TWiki.LoginNameAliasesPlugin][TWiki.LoginNameAliasesPlugin]], should have
+	* The plugin configuration topic, [[%SYSTEMWEB%.LoginNameAliasesPlugin][%SYSTEMWEB%.LoginNameAliasesPlugin]], should have
 	access permissions set such that only people in the %MAINWEB%.AdminGroup	(or other people who can be trusted) can change it.  By default, the topic is distributed with this access restriction.
 
 ---++ Caution