Remove 'Entity' term, which make reader confuse (cont)