Readding change config name and updating comments