* rename classes according CS