Renamed GenericServlet to WeaveServlet