VAMAS: fix future experiment/block upgrade entries

and suffix member variables with '_'.

see gh-2 for more details about future experiment upgrade entries