Fix bad naming issues