Align names between 7.0.x and 8.0.x (more places - thanks to kkolinko)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1553710 13f79535-47bb-0310-9956-ffa450edef68