Rename FilePathResolver -> FSiFilePathResolver