Changing variable names in config to something more sensible (#306)