should these functions be renamed now to `xxxToServlet`?