Include the model name in the beneficiary table

Modify the BeneficiaryTable.hql and entity and map to accomodate the
model name.