Rename cfg constant at places missed earlier