properly rename classes