diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm
index 3cf517341..cf5acabc2 100644
--- a/lib/WebGUI/Help/Asset.pm
+++ b/lib/WebGUI/Help/Asset.pm
@@ -21,11 +21,11 @@ our $HELP = {
 			},
 			{
 				tag => 'aoi hits',
-				namespace => 'AOIHits'
+				namespace => 'Macro_AOIHits'
 			},
 			{
 				tag => 'aoi rank',
-				namespace => 'AOIRank'
+				namespace => 'Macro_AOIRank'
 			},
 			{
 				tag => 'wobject add/edit',
@@ -43,11 +43,11 @@ our $HELP = {
                         },
 			{
 				tag => 'aoi hits',
-				namespace => 'AOIHits'
+				namespace => 'Macro_AOIHits'
 			},
 			{
 				tag => 'aoi rank',
-				namespace => 'AOIRank'
+				namespace => 'Macro_AOIRank'
 			},
                         {
                                 tag => 'wobject add/edit',
diff --git a/lib/WebGUI/Help/Macro_AOIHits.pm b/lib/WebGUI/Help/Macro_AOIHits.pm
new file mode 100644
index 000000000..9b98b6863
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AOIHits.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_AOIHits;
+
+our $HELP = {
+
+        'aoi hits' => {
+		title => 'aoi hits title',
+		body => 'aoi hits body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'metadata manage',
+				namespace => 'Asset'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AOIHits.pm b/lib/WebGUI/Help/Macro_AOIHits.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AOIHits.pm
rename to lib/WebGUI/Help/Macro_AOIHits.pm.bak
diff --git a/lib/WebGUI/Help/Macro_AOIRank.pm b/lib/WebGUI/Help/Macro_AOIRank.pm
new file mode 100644
index 000000000..218545961
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AOIRank.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_AOIRank;
+
+our $HELP = {
+
+        'aoi rank' => {
+		title => 'aoi rank title',
+		body => 'aoi rank body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'metadata manage',
+				namespace => 'Asset'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AOIRank.pm b/lib/WebGUI/Help/Macro_AOIRank.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AOIRank.pm
rename to lib/WebGUI/Help/Macro_AOIRank.pm.bak
diff --git a/lib/WebGUI/Help/Macro_AdminBar.pm b/lib/WebGUI/Help/Macro_AdminBar.pm
new file mode 100644
index 000000000..785587c74
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AdminBar.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_AdminBar;
+
+our $HELP = {
+
+        'admin bar' => {
+		title => 'admin bar title',
+		body => 'admin bar body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'template language',
+				namespace => 'Template'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AdminBar.pm b/lib/WebGUI/Help/Macro_AdminBar.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AdminBar.pm
rename to lib/WebGUI/Help/Macro_AdminBar.pm.bak
diff --git a/lib/WebGUI/Help/Macro_AdminText.pm b/lib/WebGUI/Help/Macro_AdminText.pm
new file mode 100644
index 000000000..91033380f
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AdminText.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_AdminText;
+
+our $HELP = {
+
+        'admin text' => {
+		title => 'admin text title',
+		body => 'admin text body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AdminText.pm b/lib/WebGUI/Help/Macro_AdminText.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AdminText.pm
rename to lib/WebGUI/Help/Macro_AdminText.pm.bak
diff --git a/lib/WebGUI/Help/Macro_AdminToggle.pm b/lib/WebGUI/Help/Macro_AdminToggle.pm
new file mode 100644
index 000000000..9b7f0e5cf
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AdminToggle.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_AdminToggle;
+
+our $HELP = {
+
+        'admin toggle' => {
+		title => 'admin toggle title',
+		body => 'admin toggle body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'template language',
+				namespace => 'Template'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AdminToggle.pm b/lib/WebGUI/Help/Macro_AdminToggle.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AdminToggle.pm
rename to lib/WebGUI/Help/Macro_AdminToggle.pm.bak
diff --git a/lib/WebGUI/Help/Macro_AssetProxy.pm b/lib/WebGUI/Help/Macro_AssetProxy.pm
new file mode 100644
index 000000000..dcbebc1a3
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_AssetProxy.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_AssetProxy;
+
+our $HELP = {
+
+        'asset proxy' => {
+		title => 'asset proxy title',
+		body => 'asset proxy body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'shortcut add/edit',
+				namespace => 'Shortcut'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/AssetProxy.pm b/lib/WebGUI/Help/Macro_AssetProxy.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/AssetProxy.pm
rename to lib/WebGUI/Help/Macro_AssetProxy.pm.bak
diff --git a/lib/WebGUI/Help/Macro_At_username.pm b/lib/WebGUI/Help/Macro_At_username.pm
new file mode 100644
index 000000000..740c5c967
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_At_username.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_At_username;
+
+our $HELP = {
+
+        'username' => {
+		title => 'username title',
+		body => 'username body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/At_username.pm b/lib/WebGUI/Help/Macro_At_username.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/At_username.pm
rename to lib/WebGUI/Help/Macro_At_username.pm.bak
diff --git a/lib/WebGUI/Help/Macro_CanEditText.pm b/lib/WebGUI/Help/Macro_CanEditText.pm
new file mode 100644
index 000000000..0909474f8
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_CanEditText.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_CanEditText;
+
+our $HELP = {
+
+        'can edit text' => {
+		title => 'can edit text title',
+		body => 'can edit text body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/CanEditText.pm b/lib/WebGUI/Help/Macro_CanEditText.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/CanEditText.pm
rename to lib/WebGUI/Help/Macro_CanEditText.pm.bak
diff --git a/lib/WebGUI/Help/Macro_D_date.pm b/lib/WebGUI/Help/Macro_D_date.pm
new file mode 100644
index 000000000..31ab1b73f
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_D_date.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_D_date;
+
+our $HELP = {
+
+        'date' => {
+		title => 'date title',
+		body => 'date body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/D_date.pm b/lib/WebGUI/Help/Macro_D_date.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/D_date.pm
rename to lib/WebGUI/Help/Macro_D_date.pm.bak
diff --git a/lib/WebGUI/Help/Macro_EditableToggle.pm b/lib/WebGUI/Help/Macro_EditableToggle.pm
new file mode 100644
index 000000000..299eb5326
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_EditableToggle.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_EditableToggle;
+
+our $HELP = {
+
+        'editable toggle' => {
+		title => 'editable toggle title',
+		body => 'editable toggle body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/EditableToggle.pm b/lib/WebGUI/Help/Macro_EditableToggle.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/EditableToggle.pm
rename to lib/WebGUI/Help/Macro_EditableToggle.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Env.pm b/lib/WebGUI/Help/Macro_Env.pm
new file mode 100644
index 000000000..173584716
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Env.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Env;
+
+our $HELP = {
+
+        'env' => {
+		title => 'env title',
+		body => 'env body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Env.pm b/lib/WebGUI/Help/Macro_Env.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Env.pm
rename to lib/WebGUI/Help/Macro_Env.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Execute.pm b/lib/WebGUI/Help/Macro_Execute.pm
new file mode 100644
index 000000000..306ec72ab
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Execute.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Execute;
+
+our $HELP = {
+
+        'execute' => {
+		title => 'execute title',
+		body => 'execute body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Execute.pm b/lib/WebGUI/Help/Macro_Execute.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Execute.pm
rename to lib/WebGUI/Help/Macro_Execute.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Extras.pm b/lib/WebGUI/Help/Macro_Extras.pm
new file mode 100644
index 000000000..54388ff60
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Extras.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Extras;
+
+our $HELP = {
+
+        'extras' => {
+		title => 'extras title',
+		body => 'extras body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Extras.pm b/lib/WebGUI/Help/Macro_Extras.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Extras.pm
rename to lib/WebGUI/Help/Macro_Extras.pm.bak
diff --git a/lib/WebGUI/Help/Macro_FileUrl.pm b/lib/WebGUI/Help/Macro_FileUrl.pm
new file mode 100644
index 000000000..5b872e90b
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_FileUrl.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_FileUrl;
+
+our $HELP = {
+
+        'file url' => {
+		title => 'file url title',
+		body => 'file url body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/FileUrl.pm b/lib/WebGUI/Help/Macro_FileUrl.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/FileUrl.pm
rename to lib/WebGUI/Help/Macro_FileUrl.pm.bak
diff --git a/lib/WebGUI/Help/Macro_FormParam.pm b/lib/WebGUI/Help/Macro_FormParam.pm
new file mode 100644
index 000000000..695d8acd0
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_FormParam.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_FormParam;
+
+our $HELP = {
+
+        'form param' => {
+		title => 'form param title',
+		body => 'form param body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/FormParam.pm b/lib/WebGUI/Help/Macro_FormParam.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/FormParam.pm
rename to lib/WebGUI/Help/Macro_FormParam.pm.bak
diff --git a/lib/WebGUI/Help/Macro_GroupAdd.pm b/lib/WebGUI/Help/Macro_GroupAdd.pm
new file mode 100644
index 000000000..8438c973b
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_GroupAdd.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_GroupAdd;
+
+our $HELP = {
+
+        'group add' => {
+		title => 'group add title',
+		body => 'group add body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/GroupAdd.pm b/lib/WebGUI/Help/Macro_GroupAdd.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/GroupAdd.pm
rename to lib/WebGUI/Help/Macro_GroupAdd.pm.bak
diff --git a/lib/WebGUI/Help/Macro_GroupDelete.pm b/lib/WebGUI/Help/Macro_GroupDelete.pm
new file mode 100644
index 000000000..224d77b2d
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_GroupDelete.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_GroupDelete;
+
+our $HELP = {
+
+        'group delete' => {
+		title => 'group delete title',
+		body => 'group delete body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/GroupDelete.pm b/lib/WebGUI/Help/Macro_GroupDelete.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/GroupDelete.pm
rename to lib/WebGUI/Help/Macro_GroupDelete.pm.bak
diff --git a/lib/WebGUI/Help/Macro_GroupText.pm b/lib/WebGUI/Help/Macro_GroupText.pm
new file mode 100644
index 000000000..853837348
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_GroupText.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_GroupText;
+
+our $HELP = {
+
+        'group text' => {
+		title => 'group text title',
+		body => 'group text body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/GroupText.pm b/lib/WebGUI/Help/Macro_GroupText.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/GroupText.pm
rename to lib/WebGUI/Help/Macro_GroupText.pm.bak
diff --git a/lib/WebGUI/Help/Macro_H_homeLink.pm b/lib/WebGUI/Help/Macro_H_homeLink.pm
new file mode 100644
index 000000000..eb5aa767f
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_H_homeLink.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_H_homeLink;
+
+our $HELP = {
+
+        'home link' => {
+		title => 'home link title',
+		body => 'home link body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/H_homeLink.pm b/lib/WebGUI/Help/Macro_H_homeLink.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/H_homeLink.pm
rename to lib/WebGUI/Help/Macro_H_homeLink.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Hash_userId.pm b/lib/WebGUI/Help/Macro_Hash_userId.pm
new file mode 100644
index 000000000..71a3020b1
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Hash_userId.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Hash_userId;
+
+our $HELP = {
+
+        'user id' => {
+		title => 'user id title',
+		body => 'user id body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Hash_userId.pm b/lib/WebGUI/Help/Macro_Hash_userId.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Hash_userId.pm
rename to lib/WebGUI/Help/Macro_Hash_userId.pm.bak
diff --git a/lib/WebGUI/Help/Macro_If.pm b/lib/WebGUI/Help/Macro_If.pm
new file mode 100644
index 000000000..9da4487b2
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_If.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_If;
+
+our $HELP = {
+
+        'if' => {
+		title => 'if title',
+		body => 'if body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/If.pm b/lib/WebGUI/Help/Macro_If.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/If.pm
rename to lib/WebGUI/Help/Macro_If.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Include.pm b/lib/WebGUI/Help/Macro_Include.pm
new file mode 100644
index 000000000..b075eea35
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Include.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Include;
+
+our $HELP = {
+
+        'include' => {
+		title => 'include title',
+		body => 'include body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Include.pm b/lib/WebGUI/Help/Macro_Include.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Include.pm
rename to lib/WebGUI/Help/Macro_Include.pm.bak
diff --git a/lib/WebGUI/Help/Macro_International.pm b/lib/WebGUI/Help/Macro_International.pm
new file mode 100644
index 000000000..e97a8545b
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_International.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_International;
+
+our $HELP = {
+
+        'international' => {
+		title => 'international title',
+		body => 'international body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/International.pm b/lib/WebGUI/Help/Macro_International.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/International.pm
rename to lib/WebGUI/Help/Macro_International.pm.bak
diff --git a/lib/WebGUI/Help/Macro_JavaScript.pm b/lib/WebGUI/Help/Macro_JavaScript.pm
new file mode 100644
index 000000000..c9251535e
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_JavaScript.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_JavaScript;
+
+our $HELP = {
+
+        'java script' => {
+		title => 'java script title',
+		body => 'java script body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/JavaScript.pm b/lib/WebGUI/Help/Macro_JavaScript.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/JavaScript.pm
rename to lib/WebGUI/Help/Macro_JavaScript.pm.bak
diff --git a/lib/WebGUI/Help/Macro_L_loginBox.pm b/lib/WebGUI/Help/Macro_L_loginBox.pm
new file mode 100644
index 000000000..5a9ba88ae
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_L_loginBox.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_L_loginBox;
+
+our $HELP = {
+
+        'login box' => {
+		title => 'login box title',
+		body => 'login box body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/L_loginBox.pm b/lib/WebGUI/Help/Macro_L_loginBox.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/L_loginBox.pm
rename to lib/WebGUI/Help/Macro_L_loginBox.pm.bak
diff --git a/lib/WebGUI/Help/Macro_LastModified.pm b/lib/WebGUI/Help/Macro_LastModified.pm
new file mode 100644
index 000000000..b332ed17a
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_LastModified.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_LastModified;
+
+our $HELP = {
+
+        'last modified' => {
+		title => 'last modified title',
+		body => 'last modified body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+			{
+				tag => 'date',
+				namespace => 'Macro_D_date'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/LastModified.pm b/lib/WebGUI/Help/Macro_LastModified.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/LastModified.pm
rename to lib/WebGUI/Help/Macro_LastModified.pm.bak
diff --git a/lib/WebGUI/Help/Macro_LoginToggle.pm b/lib/WebGUI/Help/Macro_LoginToggle.pm
new file mode 100644
index 000000000..7a0765bdd
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_LoginToggle.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_LoginToggle;
+
+our $HELP = {
+
+        'login toggle' => {
+		title => 'login toggle title',
+		body => 'login toggle body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/LoginToggle.pm b/lib/WebGUI/Help/Macro_LoginToggle.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/LoginToggle.pm
rename to lib/WebGUI/Help/Macro_LoginToggle.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Page.pm b/lib/WebGUI/Help/Macro_Page.pm
new file mode 100644
index 000000000..c91e685f4
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Page.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Page;
+
+our $HELP = {
+
+        'page' => {
+		title => 'page title',
+		body => 'page body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Page.pm b/lib/WebGUI/Help/Macro_Page.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Page.pm
rename to lib/WebGUI/Help/Macro_Page.pm.bak
diff --git a/lib/WebGUI/Help/Macro_PageTitle.pm b/lib/WebGUI/Help/Macro_PageTitle.pm
new file mode 100644
index 000000000..632d0f7d8
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_PageTitle.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_PageTitle;
+
+our $HELP = {
+
+        'page title' => {
+		title => 'page title title',
+		body => 'page title body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/PageTitle.pm b/lib/WebGUI/Help/Macro_PageTitle.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/PageTitle.pm
rename to lib/WebGUI/Help/Macro_PageTitle.pm.bak
diff --git a/lib/WebGUI/Help/Macro_PageUrl.pm b/lib/WebGUI/Help/Macro_PageUrl.pm
new file mode 100644
index 000000000..0f0e186a9
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_PageUrl.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_PageUrl;
+
+our $HELP = {
+
+        'page url' => {
+		title => 'page url title',
+		body => 'page url body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/PageUrl.pm b/lib/WebGUI/Help/Macro_PageUrl.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/PageUrl.pm
rename to lib/WebGUI/Help/Macro_PageUrl.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Quote.pm b/lib/WebGUI/Help/Macro_Quote.pm
new file mode 100644
index 000000000..937355723
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Quote.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Quote;
+
+our $HELP = {
+
+        'quote' => {
+		title => 'quote title',
+		body => 'quote body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Quote.pm b/lib/WebGUI/Help/Macro_Quote.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Quote.pm
rename to lib/WebGUI/Help/Macro_Quote.pm.bak
diff --git a/lib/WebGUI/Help/Macro_RandomAssetProxy.pm b/lib/WebGUI/Help/Macro_RandomAssetProxy.pm
new file mode 100644
index 000000000..f9d43b209
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_RandomAssetProxy.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_RandomAssetProxy;
+
+our $HELP = {
+
+        'random asset proxy' => {
+		title => 'random asset proxy title',
+		body => 'random asset proxy body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/RandomAssetProxy.pm b/lib/WebGUI/Help/Macro_RandomAssetProxy.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/RandomAssetProxy.pm
rename to lib/WebGUI/Help/Macro_RandomAssetProxy.pm.bak
diff --git a/lib/WebGUI/Help/Macro_RawHeadTags.pm b/lib/WebGUI/Help/Macro_RawHeadTags.pm
new file mode 100644
index 000000000..34e7d937f
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_RawHeadTags.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_RawHeadTags;
+
+our $HELP = {
+
+        'raw head tags' => {
+		title => 'raw head tags title',
+		body => 'raw head tags body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/RawHeadTags.pm b/lib/WebGUI/Help/Macro_RawHeadTags.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/RawHeadTags.pm
rename to lib/WebGUI/Help/Macro_RawHeadTags.pm.bak
diff --git a/lib/WebGUI/Help/Macro_RootTitle.pm b/lib/WebGUI/Help/Macro_RootTitle.pm
new file mode 100644
index 000000000..f23e4b2d7
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_RootTitle.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_RootTitle;
+
+our $HELP = {
+
+        'root title' => {
+		title => 'root title title',
+		body => 'root title body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/RootTitle.pm b/lib/WebGUI/Help/Macro_RootTitle.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/RootTitle.pm
rename to lib/WebGUI/Help/Macro_RootTitle.pm.bak
diff --git a/lib/WebGUI/Help/Macro_SQL.pm b/lib/WebGUI/Help/Macro_SQL.pm
new file mode 100644
index 000000000..c8229d039
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_SQL.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_SQL;
+
+our $HELP = {
+
+        'sql' => {
+		title => 'sql title',
+		body => 'sql body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/SQL.pm b/lib/WebGUI/Help/Macro_SQL.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/SQL.pm
rename to lib/WebGUI/Help/Macro_SQL.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm b/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm
new file mode 100644
index 000000000..90ea7c7f4
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Slash_gatewayUrl;
+
+our $HELP = {
+
+        'gateway url' => {
+		title => 'gateway url title',
+		body => 'gateway url body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Slash_gatewayUrl.pm b/lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Slash_gatewayUrl.pm
rename to lib/WebGUI/Help/Macro_Slash_gatewayUrl.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Spacer.pm b/lib/WebGUI/Help/Macro_Spacer.pm
new file mode 100644
index 000000000..ebd259ec0
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Spacer.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Spacer;
+
+our $HELP = {
+
+        'spacer' => {
+		title => 'spacer title',
+		body => 'spacer body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Spacer.pm b/lib/WebGUI/Help/Macro_Spacer.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Spacer.pm
rename to lib/WebGUI/Help/Macro_Spacer.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Splat_random.pm b/lib/WebGUI/Help/Macro_Splat_random.pm
new file mode 100644
index 000000000..0c84da323
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Splat_random.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Splat_random;
+
+our $HELP = {
+
+        'random' => {
+		title => 'random title',
+		body => 'random body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Splat_random.pm b/lib/WebGUI/Help/Macro_Splat_random.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Splat_random.pm
rename to lib/WebGUI/Help/Macro_Splat_random.pm.bak
diff --git a/lib/WebGUI/Help/Macro_StyleSheet.pm b/lib/WebGUI/Help/Macro_StyleSheet.pm
new file mode 100644
index 000000000..ab06e0f4d
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_StyleSheet.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_StyleSheet;
+
+our $HELP = {
+
+        'style sheet' => {
+		title => 'style sheet title',
+		body => 'style sheet body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/StyleSheet.pm b/lib/WebGUI/Help/Macro_StyleSheet.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/StyleSheet.pm
rename to lib/WebGUI/Help/Macro_StyleSheet.pm.bak
diff --git a/lib/WebGUI/Help/Macro_SubscriptionItem.pm b/lib/WebGUI/Help/Macro_SubscriptionItem.pm
new file mode 100644
index 000000000..c9e753307
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_SubscriptionItem.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_SubscriptionItem;
+
+our $HELP = {
+
+        'subscription item' => {
+		title => 'subscription item title',
+		body => 'subscription item body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/SubscriptionItem.pm b/lib/WebGUI/Help/Macro_SubscriptionItem.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/SubscriptionItem.pm
rename to lib/WebGUI/Help/Macro_SubscriptionItem.pm.bak
diff --git a/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm
new file mode 100644
index 000000000..19afbfb54
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_SubscriptionItemPurchaseUrl;
+
+our $HELP = {
+
+        'subscription item purchase url' => {
+		title => 'subscription item purchase url title',
+		body => 'subscription item purchase url body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/SubscriptionItemPurchaseUrl.pm
rename to lib/WebGUI/Help/Macro_SubscriptionItemPurchaseUrl.pm.bak
diff --git a/lib/WebGUI/Help/Macro_Thumbnail.pm b/lib/WebGUI/Help/Macro_Thumbnail.pm
new file mode 100644
index 000000000..a0af639c0
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_Thumbnail.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_Thumbnail;
+
+our $HELP = {
+
+        'thumbnail' => {
+		title => 'thumbnail title',
+		body => 'thumbnail body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros',
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/Thumbnail.pm b/lib/WebGUI/Help/Macro_Thumbnail.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/Thumbnail.pm
rename to lib/WebGUI/Help/Macro_Thumbnail.pm.bak
diff --git a/lib/WebGUI/Help/Macro_URLEncode.pm b/lib/WebGUI/Help/Macro_URLEncode.pm
new file mode 100644
index 000000000..e057a602b
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_URLEncode.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_URLEncode;
+
+our $HELP = {
+
+        'url encode' => {
+		title => 'url encode title',
+		body => 'url encode body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/URLEncode.pm b/lib/WebGUI/Help/Macro_URLEncode.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/URLEncode.pm
rename to lib/WebGUI/Help/Macro_URLEncode.pm.bak
diff --git a/lib/WebGUI/Help/Macro_User.pm b/lib/WebGUI/Help/Macro_User.pm
new file mode 100644
index 000000000..a4ab6cc1f
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_User.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_User;
+
+our $HELP = {
+
+        'user' => {
+		title => 'user title',
+		body => 'user body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros',
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/User.pm b/lib/WebGUI/Help/Macro_User.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/User.pm
rename to lib/WebGUI/Help/Macro_User.pm.bak
diff --git a/lib/WebGUI/Help/Macro_a_account.pm b/lib/WebGUI/Help/Macro_a_account.pm
new file mode 100644
index 000000000..f06424b1d
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_a_account.pm
@@ -0,0 +1,22 @@
+package WebGUI::Help::Macro_a_account;
+
+our $HELP = {
+
+        'account' => {
+		title => 'account title',
+		body => 'account body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros',
+			},
+			{
+				tag => 'template language',
+				namespace => 'Template',
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/a_account.pm b/lib/WebGUI/Help/Macro_a_account.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/a_account.pm
rename to lib/WebGUI/Help/Macro_a_account.pm.bak
diff --git a/lib/WebGUI/Help/Macro_c_companyName.pm b/lib/WebGUI/Help/Macro_c_companyName.pm
new file mode 100644
index 000000000..93c153884
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_c_companyName.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_c_companyName;
+
+our $HELP = {
+
+        'company name' => {
+		title => 'company name title',
+		body => 'company name body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/c_companyName.pm b/lib/WebGUI/Help/Macro_c_companyName.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/c_companyName.pm
rename to lib/WebGUI/Help/Macro_c_companyName.pm.bak
diff --git a/lib/WebGUI/Help/Macro_e_companyEmail.pm b/lib/WebGUI/Help/Macro_e_companyEmail.pm
new file mode 100644
index 000000000..1184f6e7e
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_e_companyEmail.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_e_companyEmail;
+
+our $HELP = {
+
+        'company email' => {
+		title => 'company email title',
+		body => 'company email body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/e_companyEmail.pm b/lib/WebGUI/Help/Macro_e_companyEmail.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/e_companyEmail.pm
rename to lib/WebGUI/Help/Macro_e_companyEmail.pm.bak
diff --git a/lib/WebGUI/Help/Macro_r_printable.pm b/lib/WebGUI/Help/Macro_r_printable.pm
new file mode 100644
index 000000000..f6e4072e1
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_r_printable.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_r_printable;
+
+our $HELP = {
+
+        'printable' => {
+		title => 'printable title',
+		body => 'printable body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/r_printable.pm b/lib/WebGUI/Help/Macro_r_printable.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/r_printable.pm
rename to lib/WebGUI/Help/Macro_r_printable.pm.bak
diff --git a/lib/WebGUI/Help/Macro_u_companyUrl.pm b/lib/WebGUI/Help/Macro_u_companyUrl.pm
new file mode 100644
index 000000000..052334a34
--- /dev/null
+++ b/lib/WebGUI/Help/Macro_u_companyUrl.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::Macro_u_companyUrl;
+
+our $HELP = {
+
+        'company url' => {
+		title => 'company url title',
+		body => 'company url body',
+		related => [
+			{
+				tag => 'macros using',
+				namespace => 'Macros'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/Help/u_companyUrl.pm b/lib/WebGUI/Help/Macro_u_companyUrl.pm.bak
similarity index 100%
rename from lib/WebGUI/Help/u_companyUrl.pm
rename to lib/WebGUI/Help/Macro_u_companyUrl.pm.bak
diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm
index 1ec7ca113..bc1ffd34a 100644
--- a/lib/WebGUI/Help/Macros.pm
+++ b/lib/WebGUI/Help/Macros.pm
@@ -26,8 +26,9 @@ our $HELP = {
 				 $tag =~ s/([A-Z]+(?![a-z]))/$1 /g; #Separate acronyms
 				 $tag =~ s/([a-z])([A-Z])/$1 $2/g;  #Separate studly caps
 				 $tag = lc $tag;
+				 $namespace = join '', 'Macro_', $_;
 				 { tag => $tag,
-				   namespace => $_ }
+				   namespace => $namespace }
 			     }
 		             values %{ $session{config}{macros} }
 			   ],