Use names from 'long-testv-on-runner' branch

 - masa metadata and masa file need to be reviewed.
   1dir and 2dir currently mapped to the same file.