Removed all the hoorrible name changes