Fix engine-defined names