Revert "Remove template matching params from GetOpName()"

This reverts commit a17f11f4eeec0c74981832721225bb93b82c3ba8.