Merge "Rephrase tracking category name"