Make names of Config functions slightly more consistent now