minor changes to file naming and SOFA terminology