Polish POMs
Formatting
Renames