DDF-419: Change UserNameServlet to UserServlet