rename classes again

classes should have their old names because of traslating system