Fixed: renamed core classes caused compilation errors