Fix names in org