[#2] updated Entity: added the entity name field