Changed configuration key names. They are now much easier to understand.