[#82011998 #82012014] Rename type into taxonomy