Rename classes with legacy (crappy) names