Changed from HTML to JSP and changed names to follow camelcase