more concise names and fixed up the tomcat quickstarts