diff --git a/app.server.properties b/app.server.properties
index 54da634bf77c69..ddf7311b4fc4fe 100644
--- a/app.server.properties
+++ b/app.server.properties
@@ -158,6 +158,7 @@
     app.server.tcserver.classes.global.dir=${app.server.tcserver.dir}/instances/liferay/lib
     app.server.tcserver.classes.portal.dir=${app.server.tcserver.portal.dir}/WEB-INF/classes
     app.server.tcserver.deploy.dir=${app.server.tcserver.dir}/instances/liferay/webapps
+    app.server.tcserver.developer.dir=${app.server.tcserver.dir}/developer-${app.server.tcserver.version}.RELEASE
     app.server.tcserver.lib.endorsed.dir=${app.server.tcserver.dir}/instances/liferay/lib
     app.server.tcserver.lib.global.dir=${app.server.tcserver.dir}/instances/liferay/lib
     app.server.tcserver.lib.portal.dir=${app.server.tcserver.deploy.dir}/ROOT/WEB-INF/lib
@@ -165,7 +166,6 @@
     app.server.tcserver.log.dir=${app.server.tcserver.dir}/instances/liferay/logs
     app.server.tcserver.portal.context=ROOT
     app.server.tcserver.portal.dir=${app.server.tcserver.deploy.dir}/${app.server.tcserver.portal.context}
-    app.server.tcserver.script.dir=${app.server.tcserver.dir}/developer-${app.server.tcserver.version}.RELEASE
     app.server.tcserver.temp.dir=${app.server.tcserver.dir}/instances/liferay/temp
     app.server.tcserver.tomcat.version=9.0.6.B.RELEASE
     app.server.tcserver.work.dir=${app.server.tcserver.dir}/instances/liferay/work
diff --git a/build-dist.xml b/build-dist.xml
index 6ce30d211b1653..7d50feb23e1dfa 100644
--- a/build-dist.xml
+++ b/build-dist.xml
@@ -1945,7 +1945,10 @@ this task.
 			/>
 		</unzip>
 
-		<move file="${app.server.tcserver.script.dir}/tcserver" tofile="${app.server.tcserver.script.dir}/tcserver.sh"/>
+		<move
+			file="${app.server.tcserver.developer.dir}/tcserver"
+			tofile="${app.server.tcserver.developer.dir}/tcserver.sh"
+		/>
 
 		<chmod
 			perm="a+x"
@@ -1960,12 +1963,12 @@ this task.
 		<if>
 			<os family="windows" />
 			<then>
-				<exec dir="${app.server.tcserver.script.dir}" executable="cmd">
+				<exec dir="${app.server.tcserver.developer.dir}" executable="cmd">
 					<arg line="/c set JAVA_OPTS= &amp; tcserver.bat create liferay -v ${app.server.tcserver.tomcat.version}" />
 				</exec>
 			</then>
 			<else>
-				<exec dir="${app.server.tcserver.script.dir}" executable="${app.server.tcserver.script.dir}/tcserver.sh">
+				<exec dir="${app.server.tcserver.developer.dir}" executable="${app.server.tcserver.developer.dir}/tcserver.sh">
 					<arg line="create liferay -v ${app.server.tcserver.tomcat.version}" />
 				</exec>
 			</else>
@@ -2001,8 +2004,8 @@ this task.
 		<replace
 			file="${app.server.tcserver.conf.dir}/server.xml"
 		>
-			<replacetoken><![CDATA[redirectPort="${bio.https.port}"/>]]></replacetoken>
-			<replacevalue><![CDATA[redirectPort="${bio.https.port}" URIEncoding="UTF-8"/>]]></replacevalue>
+			<replacetoken><![CDATA[redirectPort="${nio.https.port}"/>]]></replacetoken>
+			<replacevalue><![CDATA[redirectPort="${nio.https.port}" URIEncoding="UTF-8"/>]]></replacevalue>
 		</replace>
 
 		<replace
diff --git a/build-test-tcserver.xml b/build-test-tcserver.xml
index b9a14d43db8c2f..6f267057c87ab5 100644
--- a/build-test-tcserver.xml
+++ b/build-test-tcserver.xml
@@ -24,8 +24,8 @@
 
 			set JAVA_OPTS=
 
-			call ${app.server.tcserver.script.dir}/tcserver stop liferay
-			call ${app.server.tcserver.script.dir}/tcserver uninstall liferay
+			call ${app.server.tcserver.developer.dir}/tcserver stop liferay
+			call ${app.server.tcserver.developer.dir}/tcserver uninstall liferay
 
 			set JAVA_OPTS=%JAVA_OPTS_TEMP%
 
@@ -33,7 +33,7 @@
 		</echo>
 
 		<echo file="${app.server.tcserver.bin.dir}/shutdown.sh">
-			${app.server.tcserver.script.dir}/./tcserver.sh stop liferay
+			${app.server.tcserver.developer.dir}/./tcserver.sh stop liferay
 		</echo>
 
 		<echo file="${app.server.tcserver.bin.dir}/startup.bat">
@@ -43,8 +43,8 @@
 
 			set JAVA_OPTS=
 
-			call ${app.server.tcserver.script.dir}/tcserver install liferay
-			call ${app.server.tcserver.script.dir}/tcserver run liferay
+			call ${app.server.tcserver.developer.dir}/tcserver install liferay
+			call ${app.server.tcserver.developer.dir}/tcserver run liferay
 
 			set JAVA_OPTS=%JAVA_OPTS_TEMP%
 
@@ -52,7 +52,7 @@
 		</echo>
 
 		<echo file="${app.server.tcserver.bin.dir}/startup.sh">
-			${app.server.tcserver.script.dir}/./tcserver.sh run liferay
+			${app.server.tcserver.developer.dir}/./tcserver.sh run liferay
 		</echo>
 
 		<chmod