Comment, format and reorder properties file
Rename configuration property for consistency