I agree

@adykstra please finish just the renaming without API change and we'll
tackle the rest in another PR