diff --git a/index.html b/index.html
index db3e1ef..56a1229 100755
--- a/index.html
+++ b/index.html
@@ -42,8 +42,7 @@ var activateWikiWords = text =>
 		// set new...
 		.replace(
 			RegExp('('+[
-				'[A-Z][a-z0-9]+[A-Z][a-z0-9][a-zA-Z0-9]*\/\\w+',
-				'[A-Z][a-z0-9]+[A-Z][a-z0-9][a-zA-Z0-9]*',
+				'[A-Z][a-z0-9]+[A-Z\/][a-zA-Z0-9\/]*',
 				'\\[[^\\]]+\\]',
 				].join('|') +')', 'g'),
 			'<a class="WikiWord" href="#" onclick="go($(this).text().replace(/^\\[|\\]$/g, \'\'))">$1</a>')
diff --git a/wiki.js b/wiki.js
index 62e025b..bdc2a50 100755
--- a/wiki.js
+++ b/wiki.js
@@ -22,7 +22,7 @@
 // 		}
 // 	}
 var data = {
-	'TemplatePages/DefaultPage': {
+	'Templates/DefaultPage': {
 		text: 'This page is empty.<br><br>WikiHome',
 	},
 }
@@ -45,7 +45,7 @@ var Wiki = {
 
 	__home_page__: 'WikiHome',
 	__default_page__: 'DefaultPage',
-	__templates__: 'TemplatePages',
+	__templates__: 'Templates',
 
 
 	// current location...