Fix up uniq_name handling