Fix all names