Merge "Properly mangle file names"