Renamed uri_generator back to value_generator.