Fixing some of the config naming conventions.