Replace all GR references to CFG