Renamed granularity cpp definitions.