Renamed maec_id_generator to id_generator