Rename references to EntityBase