Fixes class names