Rename EntityBase to BaseEntity