Servlet rename for consistency