Renamed a lot and simplified the config to make stuff easier for IT operations