Use consistent naming for settings keys
Merge pull request #10 from ADmad/develop

Use consistent naming for settings keys