Changes for Servlet Name Change