fixed messed up names