Bug 841422 - Follow-up, standardize filenames r=me