Fixed more namespaces and pom.xml