Incorporating matrix names into snapshot output filenames and adding parentheses into odsq6 to avoid compiler warnings.