partial cleanup of '../../spl' type prefixes for Data files