Added info to CFG and fixed naming convention