I'd use only one of the two tagging schemes. It's quite obvious that there are two "competing" schemes to every data user - and if there really will be some consensus on tagging, changing the existing objects should not be a big problem.