[#2057] Fix filename munging