diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index 890866d41..d03dc1649 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -456,7 +456,7 @@ class cron_admin_ui extends e_admin_ui
 				}
 				else
 				{
-					$message = str_replace('[method]', $method_name."()", "Config function [b][method][/b] NOT found.");
+					$message = str_replace('[x]', $method_name."()", "Config function [b][x][/b] NOT found.");
 					$mes->add($message, E_MESSAGE_DEBUG);
 				}
 			}
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 42b49246f..6959be1a3 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -455,7 +455,7 @@ class system_tools
 		
 		if(!isset($POST['create_multisite']))
 		{
-			$info = str_replace('[domain]', e_DOMAIN, LANINS_133);
+			$info = str_replace('[x]', e_DOMAIN, LANINS_133);
 			$mes->addInfo($info);
 		}
 		
diff --git a/e107_admin/language.php b/e107_admin/language.php
index 4b54470c3..6a85f72c3 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -1447,7 +1447,7 @@ function zip_up_lang($language)
 		$ret['error'] = TRUE;
 		$file = "e107_languages/{$language}/{$language}.php";
 		$def = (defined('LANG_LAN_25')) ? LANG_LAN_25 : LANG_LAN_119;
-		$ret['message'] = str_replace("[lcpath]",$file,$def); // 
+		$ret['message'] = str_replace("[x]",$file,$def); //
 		return $ret;	
 	}
 		
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 84a228c51..a10a984d5 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -179,7 +179,7 @@ $frm = e107::getForm();
 
 function e_help()
 {
-	$help_text = str_replace('[interval]', (PLUGIN_SCAN_INTERVAL ? PLUGIN_SCAN_INTERVAL / 60 : 0), EPL_ADLAN_228);
+	$help_text = str_replace('[x]', (PLUGIN_SCAN_INTERVAL ? PLUGIN_SCAN_INTERVAL / 60 : 0), EPL_ADLAN_228);
 	return array(
 		'caption'	=> EPL_ADLAN_227,
 		'text'		=> $help_text."<p><a class='btn btn-mini btn-primary' href='".e_SELF."?refresh'>".EPL_ADLAN_229."</a></p>"
@@ -1195,7 +1195,7 @@ class pluginManager{
 		else
 		{
 			$text .= "<tr><td class='center' colspan='".count($this->fields)."'>";
- 			$text .= str_replace("[link]", "<a href='".e_ADMIN."plugin.php?avail'>".EPL_ADLAN_100."</a>", EPL_ADLAN_101);
+ 			$text .= str_replace("[x]", "<a href='".e_ADMIN."plugin.php?avail'>".EPL_ADLAN_100."</a>", EPL_ADLAN_101);
 			$text .= "</td></tr>";
 		}
 
@@ -2221,7 +2221,7 @@ class pluginBuilder
 
 			$info = EPL_ADLAN_102;
 			$info .= "<ul>";
-			$info .= "<li>".str_replace('[e_PLUGIN]', e_PLUGIN, EPL_ADLAN_103)."</li>";
+			$info .= "<li>".str_replace('[x]', e_PLUGIN, EPL_ADLAN_103)."</li>";
 			$info .= "<li>".EPL_ADLAN_104."</li>";
 			$info .= "<li>".EPL_ADLAN_105."</li>";
 			$info .= "<li>".EPL_ADLAN_106."</li>";
@@ -2464,7 +2464,7 @@ class pluginBuilder
 					
 					if(file_put_contents(e_PLUGIN.$this->pluginName."/".$this->pluginName."_sql.php",$cont))
 					{
-						$info = str_replace('[file]', $this->pluginName."_sql.php", EPL_ADLAN_132);
+						$info = str_replace('[x]', $this->pluginName."_sql.php", EPL_ADLAN_132);
 						$mes->addInfo($info,'default',true);
 						$red = e107::getRedirect();
 						$red->redirect(e_REQUEST_URL,true);
@@ -2472,8 +2472,8 @@ class pluginBuilder
 					}
 					else 
 					{
-						$msg = str_replace('[file]', $this->pluginName."_sql.php", EPL_ADLAN_133)."<br />";
-						$msg .= str_replace(array('[file]','[content]'), array($this->pluginName."_sql.php",$cont), EPL_ADLAN_134);
+						$msg = str_replace('[x]', $this->pluginName."_sql.php", EPL_ADLAN_133)."<br />";
+						$msg .= str_replace(array('[x]','[y]'), array($this->pluginName."_sql.php",$cont), EPL_ADLAN_134);
 						$mes->addWarning($msg);	
 					}
 					
@@ -3607,12 +3607,12 @@ exit;
 			{
 				if(file_put_contents($generatedFile, $startPHP .$text . $endPHP))
 				{
-					$message = str_replace("[link]", "<a href='".$generatedFile."'>".EPL_ADLAN_216."</a>", EPL_ADLAN_217);
+					$message = str_replace("[x]", "<a href='".$generatedFile."'>".EPL_ADLAN_216."</a>", EPL_ADLAN_217);
 					$mes->addSuccess($message);
 				}	
 				else 
 				{
-					$mes->addError(str_replace('[file]', $generatedFile, EPL_ADLAN_218));
+					$mes->addError(str_replace('[x]', $generatedFile, EPL_ADLAN_218));
 				}
 			}
 			else
diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php
index 9a1c7236d..c5924b892 100644
--- a/e107_languages/English/admin/lan_language.php
+++ b/e107_languages/English/admin/lan_language.php
@@ -78,7 +78,7 @@ define("LANG_LAN_115", "Please verify and correct the remaining [x] error(s) bef
 define("LANG_LAN_116", "Please verify your language files ('Verify') then try again.");
 define("LANG_LAN_117", "You should correct the remaining errors before contributing your language pack.");
 define("LANG_LAN_118", "Please verify your language files ('Verify') then try again.");
-define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [lcpath] and try again.");
+define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [x] and try again.");
 define("LANG_LAN_120", "Please make sure you are using default folder names in e107_config.php (eg. e107_languages/, e107_plugins/ etc.) and try again.");
 define("LANG_LAN_121", "Couldn't Load:");
 define("LANG_LAN_124", "Definition");
diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php
index dbf713fd4..7bbb936fc 100644
--- a/e107_languages/English/admin/lan_plugin.php
+++ b/e107_languages/English/admin/lan_plugin.php
@@ -116,9 +116,9 @@ define ('EPL_ADLAN_97',"There was a problem extracting the .zip file to your plu
 define ('EPL_ADLAN_98',"Unknown file:");
 define ('EPL_ADLAN_99',"Error messages above this line");
 define ('EPL_ADLAN_100',"click here to install some");
-define ('EPL_ADLAN_101',"No plugins installed - [link].");
+define ('EPL_ADLAN_101',"No plugins installed - [x].");
 define ('EPL_ADLAN_102',"This Wizard will build an admin area for your plugin and generate a plugin.xml meta file. Before you start:");
-define ('EPL_ADLAN_103',"Create a new writable folder in the [e_PLUGIN] directory eg. [b]myplugin[/b]");
+define ('EPL_ADLAN_103',"Create a new writable folder in the [x] directory eg. [b]myplugin[/b]");
 define ('EPL_ADLAN_104',"If your plugin will use sql tables, create a new file in this folder and name it the same as the directory but with [b]_sql.php[/b] as a sufix eg. [b]myplugin_sql.php[/b]");
 define ('EPL_ADLAN_105',"Create your table in phpMyAdmin and paste an sql dump of it into your file and save. (see [i]e107_plugins/_blank/_blank_sql.php[/i] for an example)");
 define ('EPL_ADLAN_106',"Select your plugin's folder to begin.");
@@ -149,9 +149,9 @@ define ('EPL_ADLAN_128',"File");
 define ('EPL_ADLAN_129',"Preference Name");
 define ('EPL_ADLAN_130',"Default Value");
 define ('EPL_ADLAN_131',"Field Type...");
-define ('EPL_ADLAN_132',"[file] has been generated");
-define ('EPL_ADLAN_133',"[file] is missing!");
-define ('EPL_ADLAN_134',"Please create [b][file][/b] in your plugin directory with the following content: [content]");
+define ('EPL_ADLAN_132',"[x] has been generated");
+define ('EPL_ADLAN_133',"[x] is missing!");
+define ('EPL_ADLAN_134',"Please create [b][x][/b] in your plugin directory with the following content: [y]");
 define ('EPL_ADLAN_135',"The name of your plugin. (Must be written in English)");
 define ('EPL_ADLAN_136',"If you have a language file, enter the LAN_XXX value for the plugin's name");
 define ('EPL_ADLAN_137',"Creation date of your plugin");
@@ -250,8 +250,8 @@ define ('EPL_ADLAN_214',"Images (array)");
 define ('EPL_ADLAN_215',"Hidden");
 
 define ('EPL_ADLAN_216',"Click Here");
-define ('EPL_ADLAN_217',"[link] to vist your generated admin area");
-define ('EPL_ADLAN_218',"Could not write to [file]");
+define ('EPL_ADLAN_217',"[x] to vist your generated admin area");
+define ('EPL_ADLAN_218',"Could not write to [x]");
 define ('EPL_ADLAN_219',"No Files have been created. Please Copy &amp; Paste the code below into your files.");
 
 define ('EPL_ADLAN_220',"Find Plugins");
@@ -265,7 +265,7 @@ define ('EPL_ADLAN_225',"Unsure");
 define ('EPL_ADLAN_226',"Plugin Language-File Check");
 
 define ('EPL_ADLAN_227',"Scan for Changes");
-define ('EPL_ADLAN_228',"Plugin folders are scanned every [interval] minutes for changes. Click the button below to scan now.");
+define ('EPL_ADLAN_228',"Plugin folders are scanned every [x] minutes for changes. Click the button below to scan now.");
 define ('EPL_ADLAN_229',"Refresh");
 
 define('LAN_UPGRADE_SUCCESSFUL', "Upgrade Successful");
diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index fa66bedeb..8dd844820 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -189,4 +189,4 @@ define("LANINS_129", "Database not found.");
 define('LANINS_130', "Parked Domain");
 define('LANINS_131', "The parked domain which will become a new e107 website.");
 define('LANINS_132', "mydomain.com");
-define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of [domain]");
+define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of [x]");