reflect vadr name change
Improve tagging

(files that depend on tagged files should depend on the tags)