Minor renaming; POM cleanu