Stop using EntityDiff alias