more better biosample modeling, some cosmetic field name changes