Minor updates to allTags
Minor update to namesTypes