Also, you can use a tag editor such as MP3Tag (Internet freeware) to edit either/both your tags and the file names, including by using the tags to rename all the the file names (or vice-versa) with a single button press. Highly recommended (and manageable to use).