Hi mfournier, Justin submitted these changes for me as part of other work his was working on at the time, so I'll respond. 

For us, the lens did not exist with this name and thus it made sense to more generalize.  Writing some logic to handle lens pathing and naming as well as more correctly generalize file location may be worth some investigation.