Naming convention and dispatcher-servlet.xml fix