Renamed context-params  and  to  and
Removed SingleAgentServlet