More pom <name> consistency changes