Fix names of EVERYTHING