Fixed renamed class issue