Merge "Use more inclusive terms"