Servlet class names fix, CommonService method name fix