Rename and move granularity enum.