This is what I do for naming my files. Before, I've never included the year in the file name, but now I do, not absolutely necessary, but I do this to all my files now.
Before if I had a movie and the cover art looks off, or wasn't the right one. I would go to TMDB and type in that movie. Also I'd click the little pencil icon and click on info to see what I had that file named as. Also looking at TMDB to see how they have spelled that movie name.
For example I had a movie called High Rise. There's a few of them on TMDB, but the one I had was actually High-Rise (hyphen), and the release date was 2015, so I name my file High-Rise (2015). So if you name the file and include the year in brackets, then it should pull in the proper data.
I know you can select Fix Match, and do it this way, but I've never ran into an issue with proper file naming.