Renamed SamplePositionGenerator -> OldSamplePositionGenerator