Clean up confusingly named flavor tagging variables

Some of the variables we use in flavor tagging are very misleadingly (wrongly?) named. I'm fixing this here. I'm also allowing the old names in our ML models since we're running quite a few that use these names.

This should change absolutely nothing in the output from any jobs.