update naming - rename tag* to thing*