Renamed GenericUniform to Uniform