Rename some config param for consistencies sake.
Add general config params