Fixes for qualified names used in tag names.