Generate slightly better names in full normaliser.