Fixed some issues with renamed class file