Merge "Use proper API to get op name"