Cleaned up and renamed some of the configs