Port latest name generator changes