Reformat and some rename in pom.xml