Revert configuration changes from previous commits

Don't change the names/move the configs.