rename mvn module names

So that we follow consistent naming