Fix dependency issue with config variables
Use better namings for config variables