Rename configuration section name
Shape up minors