Follow Up for #8270: fixed some naming and CGL issues