Fixed weird names for things