Changed the name of all the configuration options to be more standardised, and removed implementation specific options.