renamed some config options to be a little more clear