Straighten out pom names, reformat pom