Rename EntityBase to AbstractEntity