A bit of renaming to feel less icky about the vars/tags situation