Some cleanup in pom.xml + m
Some renames + m