Added "Name" field for all entities