Fix wrong annotation handling in name generation.