Rename files to be consistent with modules