Issue 82: Refactor of code to use consistent names
Issue 82: Aim for consistent configuration and keep backwards compatibility
Merge pull request #83 from scobal/config_refactor_two

A bit more config refactor