Removed the last of the hardcoding for tomcat

Last bits of hardcoding removed from the title of the tasks.