making file name/path consistent for both branches