- Fixed inconsistencies in Servlet class naming and usage in ServletContext#getNamedDispatcher(...) calls
- Use properties value for main model rather than a magic String