I may be a bit late on this, and I'm too lazy to do the google searches myself, but look for...
The Godfather
Tag&Rename
Tagscanner
or Musicbrainz
All of these are very good at editing or adding ID3 tags and renaming files if needed. Personally I use Tagscanner and couldn't get along without it.