diff --git a/portal-impl/src/com/liferay/portlet/wiki/WikiFriendlyURLMapper.java b/portal-impl/src/com/liferay/portlet/wiki/WikiFriendlyURLMapper.java
index edf2938c0127badbc0255c92398f6b348d9a862f..3c0736a980eec18bc2822d05ce14af98c110c6ae 100644
--- a/portal-impl/src/com/liferay/portlet/wiki/WikiFriendlyURLMapper.java
+++ b/portal-impl/src/com/liferay/portlet/wiki/WikiFriendlyURLMapper.java
@@ -17,8 +17,8 @@ package com.liferay.portlet.wiki;
 import com.liferay.portal.kernel.portlet.DefaultFriendlyURLMapper;
 import com.liferay.portal.kernel.portlet.LiferayPortletURL;
 import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portlet.wiki.util.WikiUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,10 +62,10 @@ public class WikiFriendlyURLMapper extends DefaultFriendlyURLMapper {
 		String value = routeParameters.get(name);
 
 		if (escape) {
-			value = StringUtil.replace(value, _UNESCAPED_CHARS, _ESCAPED_CHARS);
+			value = WikiUtil.escapeName(value);
 		}
 		else {
-			value = StringUtil.replace(value, _ESCAPED_CHARS, _UNESCAPED_CHARS);
+			value = WikiUtil.unescapeName(value);
 		}
 
 		routeParameters.put(name, value);
@@ -82,12 +82,4 @@ public class WikiFriendlyURLMapper extends DefaultFriendlyURLMapper {
 		super.populateParams(parameterMap, namespace, routeParameters);
 	}
 
-	private static final String[] _ESCAPED_CHARS = new String[] {
-		"<PLUS>", "<QUESTION>", "<SLASH>"
-	};
-
-	private static final String[] _UNESCAPED_CHARS = new String[] {
-		StringPool.PLUS, StringPool.QUESTION, StringPool.SLASH
-	};
-
 }
\ No newline at end of file
