diff --git a/doc/ImportONNXDefs.md b/doc/ImportONNXDefs.md
index ee25838..20b74f2 100644
--- a/doc/ImportONNXDefs.md
+++ b/doc/ImportONNXDefs.md
@@ -13,6 +13,9 @@ ONNF modified this script to import ONNX specifications into ONNF. There are two
 5. copy the two file into your ONNF: cp onnxop.inc your_ONNF/src/dialect/onnx/onnxop.inc; cp op_build_table.inc your_ONNF/src/builder
 6. go to your ONNF and build
 
+## Consistency
+The Operators.md generated by gen_doc.py is copied into doc. Please refer to this specification, not the one in onnx github, to make sure operators are consistent in version with onnxop.inc.
+
 ## Customization
 In addition to following the ONNF specification, the modified gen_doc.py provides some mechanism for you to customize the output. 
 Several tables are defined at the beginning of the script:
diff --git a/doc/gen_doc.py b/doc/gen_doc.py
index e0c9bcc..bd126d5 100644
--- a/doc/gen_doc.py
+++ b/doc/gen_doc.py
@@ -120,6 +120,11 @@ def display_version_link(name, version):  # type: (Text, int) -> Text
     name_with_ver = '{}-{}'.format(name, version)
     return '<a href="{}#{}">{}</a>'.format(changelog_md, name_with_ver, name_with_ver)
 
+def get_unique_output_name(schema, name):
+    for input in schema.inputs :
+        if input.name == name :
+            return 'out_'+name
+    return name
 
 def display_schema(schema, versions):  # type: (OpSchema, Sequence[OpSchema]) -> Text
     s = ''
@@ -223,7 +228,7 @@ def display_schema(schema, versions):  # type: (OpSchema, Sequence[OpSchema]) ->
                     option_str = " (variadic)"
                 else:
                     option_str = " (variadic, heterogeneous)"
-            s += '<dt><tt>{}</tt>{} : {}</dt>\n'.format(output.name, option_str, output.typeStr)
+            s += '<dt><tt>{}</tt>{} : {}</dt>\n'.format(get_unique_output_name(schema, output.name), option_str, output.typeStr)
             s += '<dd>{}</dd>\n'.format(output.description)
         s += '</dl>\n'
 
@@ -302,7 +307,6 @@ def  collect_types(schema, input) :
     return allowedTypeStr
 
 def gen_schema(schema) :
-    skip_attr_gen = []
     line_indent = '  '
 
     #s = 'def ONNX'+schema.name+str(schema.since_version)+'Op:ONNX_Op<"'+schema.name+'", \n'
@@ -368,8 +372,7 @@ def gen_schema(schema) :
                     #TODO handle  (variadic, heterogeneous)"
                     t=''
             s+=':$'+input.name
-    if not schema.name in skip_attr_gen :
-        s += gen_attr_ins(schema, isfirst)
+    s += gen_attr_ins(schema, isfirst)
     s+= ');'
 
     #output
@@ -377,14 +380,14 @@ def gen_schema(schema) :
     if schema.outputs:
         for output in schema.outputs:
             if output != schema.outputs[0] :
-                s+= ', '
+                s+= ',\n           '
             #need to interpret output.typeStr
             etypes=collect_types(schema, output)
             if etypes == '':
                 s+= 'AnyTypeOf<[AnyMemRef, AnyTensor]>'
             else:
                 s+= 'TensorOf<['+etypes+']>'
-            s += ':$o_'+output.name
+            s += ':$'+get_unique_output_name(schema, output.name)
     s+= ');\n'
 
     #s+= 'let hasCanonicalizer = 1;'
diff --git a/src/dialect/onnx/onnxop.inc b/src/dialect/onnx/onnxop.inc
index 360ea1f..2956238 100644
--- a/src/dialect/onnx/onnxop.inc
+++ b/src/dialect/onnx/onnxop.inc
@@ -13,7 +13,7 @@ def ONNXAbsOp:ONNX_Op<"Abs",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXAcosOp:ONNX_Op<"Acos", 
@@ -23,7 +23,7 @@ def ONNXAcosOp:ONNX_Op<"Acos",
     "Calculates the arccosine (inverse of cosine) of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAcoshOp:ONNX_Op<"Acosh", 
@@ -33,7 +33,7 @@ def ONNXAcoshOp:ONNX_Op<"Acosh",
     "Calculates the hyperbolic arccosine of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAddOp:ONNX_Op<"Add", 
@@ -47,7 +47,7 @@ def ONNXAddOp:ONNX_Op<"Add",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXAndOp:ONNX_Op<"And", 
@@ -61,7 +61,7 @@ def ONNXAndOp:ONNX_Op<"And",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXArgMaxOp:ONNX_Op<"ArgMax", 
@@ -76,7 +76,7 @@ def ONNXArgMaxOp:ONNX_Op<"ArgMax",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            DefaultValuedAttr<I64Attr, "0">:$axis,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXArgMinOp:ONNX_Op<"ArgMin", 
@@ -91,7 +91,7 @@ def ONNXArgMinOp:ONNX_Op<"ArgMin",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            DefaultValuedAttr<I64Attr, "0">:$axis,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXAsinOp:ONNX_Op<"Asin", 
@@ -101,7 +101,7 @@ def ONNXAsinOp:ONNX_Op<"Asin",
     "Calculates the arcsine (inverse of sine) of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAsinhOp:ONNX_Op<"Asinh", 
@@ -111,7 +111,7 @@ def ONNXAsinhOp:ONNX_Op<"Asinh",
     "Calculates the hyperbolic arcsine of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAtanOp:ONNX_Op<"Atan", 
@@ -121,7 +121,7 @@ def ONNXAtanOp:ONNX_Op<"Atan",
     "Calculates the arctangent (inverse of tangent) of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAtanhOp:ONNX_Op<"Atanh", 
@@ -131,7 +131,7 @@ def ONNXAtanhOp:ONNX_Op<"Atanh",
     "Calculates the hyperbolic arctangent of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXAveragePoolOp:ONNX_Op<"AveragePool", 
@@ -175,7 +175,7 @@ def ONNXAveragePoolOp:ONNX_Op<"AveragePool",
            I64ArrayAttr:$kernel_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXBatchNormalizationOp:ONNX_Op<"BatchNormalization", 
@@ -200,7 +200,11 @@ def ONNXBatchNormalizationOp:ONNX_Op<"BatchNormalization",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$var,
            DefaultValuedAttr<F32Attr, "1e-05">:$epsilon,
            DefaultValuedAttr<F32Attr, "0.9">:$momentum);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_mean, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_var, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_saved_mean, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_saved_var);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$out_mean,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$out_var,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$saved_mean,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$saved_var);
 }
 
 def ONNXBitShiftOp:ONNX_Op<"BitShift", 
@@ -223,7 +227,7 @@ def ONNXBitShiftOp:ONNX_Op<"BitShift",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
            StrAttr:$direction);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Z);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Z);
 }
 
 def ONNXCastOp:ONNX_Op<"Cast", 
@@ -252,7 +256,7 @@ def ONNXCastOp:ONNX_Op<"Cast",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            I64Attr:$to);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXCeilOp:ONNX_Op<"Ceil", 
@@ -264,7 +268,7 @@ def ONNXCeilOp:ONNX_Op<"Ceil",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXClipOp:ONNX_Op<"Clip", 
@@ -278,7 +282,7 @@ def ONNXClipOp:ONNX_Op<"Clip",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$min,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$max);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXCompressOp:ONNX_Op<"Compress", 
@@ -293,7 +297,7 @@ def ONNXCompressOp:ONNX_Op<"Compress",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$condition,
            OptionalAttr<I64Attr>:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXConcatOp:ONNX_Op<"Concat", 
@@ -304,7 +308,7 @@ def ONNXConcatOp:ONNX_Op<"Concat",
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$inputs,
            I64Attr:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_concat_result);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$concat_result);
 }
 
 def ONNXConcatFromSequenceOp:ONNX_Op<"ConcatFromSequence", 
@@ -319,7 +323,7 @@ def ONNXConcatFromSequenceOp:ONNX_Op<"ConcatFromSequence",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input_sequence,
            I64Attr:$axis,
            DefaultValuedAttr<I64Attr, "0">:$new_axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_concat_result);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$concat_result);
 }
 
 def ONNXConstantOp:ONNX_Op<"Constant", 
@@ -331,7 +335,7 @@ def ONNXConstantOp:ONNX_Op<"Constant",
   }];
   let arguments = (ins OptionalAttr<AnyAttr>:$sparse_value,
            OptionalAttr<AnyAttr>:$value);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXConstantOfShapeOp:ONNX_Op<"ConstantOfShape", 
@@ -342,7 +346,7 @@ def ONNXConstantOfShapeOp:ONNX_Op<"ConstantOfShape",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            OptionalAttr<AnyAttr>:$value);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXConvOp:ONNX_Op<"Conv", 
@@ -361,7 +365,7 @@ def ONNXConvOp:ONNX_Op<"Conv",
            OptionalAttr<I64ArrayAttr>:$kernel_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXConvIntegerOp:ONNX_Op<"ConvInteger", 
@@ -381,7 +385,7 @@ def ONNXConvIntegerOp:ONNX_Op<"ConvInteger",
            OptionalAttr<I64ArrayAttr>:$kernel_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXConvTransposeOp:ONNX_Op<"ConvTranspose", 
@@ -414,7 +418,7 @@ def ONNXConvTransposeOp:ONNX_Op<"ConvTranspose",
            OptionalAttr<I64ArrayAttr>:$output_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXCosOp:ONNX_Op<"Cos", 
@@ -424,7 +428,7 @@ def ONNXCosOp:ONNX_Op<"Cos",
     "Calculates the cosine of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXCoshOp:ONNX_Op<"Cosh", 
@@ -434,7 +438,7 @@ def ONNXCoshOp:ONNX_Op<"Cosh",
     "Calculates the hyperbolic cosine of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXCumSumOp:ONNX_Op<"CumSum", 
@@ -466,7 +470,7 @@ def ONNXCumSumOp:ONNX_Op<"CumSum",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$axis,
            DefaultValuedAttr<I64Attr, "0">:$exclusive,
            DefaultValuedAttr<I64Attr, "0">:$reverse);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXDepthToSpaceOp:ONNX_Op<"DepthToSpace", 
@@ -504,7 +508,7 @@ def ONNXDepthToSpaceOp:ONNX_Op<"DepthToSpace",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            I64Attr:$blocksize,
            DefaultValuedAttr<StrAttr, "DCR">:$mode);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXDequantizeLinearOp:ONNX_Op<"DequantizeLinear", 
@@ -519,7 +523,7 @@ def ONNXDequantizeLinearOp:ONNX_Op<"DequantizeLinear",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$x,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$x_scale,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$x_zero_point);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXDetOp:ONNX_Op<"Det", 
@@ -533,7 +537,7 @@ def ONNXDetOp:ONNX_Op<"Det",
     "e.g., When the input is 2-D, the output is a scalar(shape is empty: `[]`)."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXDivOp:ONNX_Op<"Div", 
@@ -546,7 +550,7 @@ def ONNXDivOp:ONNX_Op<"Div",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXDropoutOp:ONNX_Op<"Dropout", 
@@ -562,7 +566,8 @@ def ONNXDropoutOp:ONNX_Op<"Dropout",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            DefaultValuedAttr<F32Attr, "0.5">:$ratio);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_mask);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$mask);
 }
 
 def ONNXDynamicQuantizeLinearOp:ONNX_Op<"DynamicQuantizeLinear", 
@@ -593,7 +598,9 @@ def ONNXDynamicQuantizeLinearOp:ONNX_Op<"DynamicQuantizeLinear",
     "```"
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$x);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y_scale, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y_zero_point);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_scale,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_zero_point);
 }
 
 def ONNXEluOp:ONNX_Op<"Elu", 
@@ -607,7 +614,7 @@ def ONNXEluOp:ONNX_Op<"Elu",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<F32Attr, "1.0">:$alpha);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXEqualOp:ONNX_Op<"Equal", 
@@ -621,7 +628,7 @@ def ONNXEqualOp:ONNX_Op<"Equal",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXErfOp:ONNX_Op<"Erf", 
@@ -631,7 +638,7 @@ def ONNXErfOp:ONNX_Op<"Erf",
     "Computes the error function of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXExpOp:ONNX_Op<"Exp", 
@@ -641,7 +648,7 @@ def ONNXExpOp:ONNX_Op<"Exp",
     "Calculates the exponential of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXExpandOp:ONNX_Op<"Expand", 
@@ -659,7 +666,7 @@ def ONNXExpandOp:ONNX_Op<"Expand",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$shape);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXEyeLikeOp:ONNX_Op<"EyeLike", 
@@ -677,7 +684,7 @@ def ONNXEyeLikeOp:ONNX_Op<"EyeLike",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            OptionalAttr<I64Attr>:$dtype,
            DefaultValuedAttr<I64Attr, "0">:$k);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXFlattenOp:ONNX_Op<"Flatten", 
@@ -690,7 +697,7 @@ def ONNXFlattenOp:ONNX_Op<"Flatten",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "1">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXFloorOp:ONNX_Op<"Floor", 
@@ -702,7 +709,7 @@ def ONNXFloorOp:ONNX_Op<"Floor",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXGRUOp:ONNX_Op<"GRU", 
@@ -796,7 +803,8 @@ def ONNXGRUOp:ONNX_Op<"GRU",
            DefaultValuedAttr<StrAttr, "forward">:$direction,
            OptionalAttr<I64Attr>:$hidden_size,
            DefaultValuedAttr<I64Attr, "0">:$linear_before_reset);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y_h);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y_h);
 }
 
 def ONNXGatherOp:ONNX_Op<"Gather", 
@@ -864,7 +872,7 @@ def ONNXGatherOp:ONNX_Op<"Gather",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
            DefaultValuedAttr<I64Attr, "0">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXGatherElementsOp:ONNX_Op<"GatherElements", 
@@ -930,7 +938,7 @@ def ONNXGatherElementsOp:ONNX_Op<"GatherElements",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
            DefaultValuedAttr<I64Attr, "0">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXGatherNDOp:ONNX_Op<"GatherND", 
@@ -1005,7 +1013,7 @@ def ONNXGatherNDOp:ONNX_Op<"GatherND",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXGemmOp:ONNX_Op<"Gemm", 
@@ -1033,7 +1041,7 @@ def ONNXGemmOp:ONNX_Op<"Gemm",
            DefaultValuedAttr<F32Attr, "1.0">:$beta,
            DefaultValuedAttr<I64Attr, "0">:$transA,
            DefaultValuedAttr<I64Attr, "0">:$transB);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXGlobalAveragePoolOp:ONNX_Op<"GlobalAveragePool", 
@@ -1045,7 +1053,7 @@ def ONNXGlobalAveragePoolOp:ONNX_Op<"GlobalAveragePool",
     " equal to the spatial dimension of input tensor."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXGlobalLpPoolOp:ONNX_Op<"GlobalLpPool", 
@@ -1058,7 +1066,7 @@ def ONNXGlobalLpPoolOp:ONNX_Op<"GlobalLpPool",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<I64Attr, "2">:$p);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXGlobalMaxPoolOp:ONNX_Op<"GlobalMaxPool", 
@@ -1070,7 +1078,7 @@ def ONNXGlobalMaxPoolOp:ONNX_Op<"GlobalMaxPool",
     " equal to the spatial dimension of input tensor."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXGreaterOp:ONNX_Op<"Greater", 
@@ -1084,7 +1092,7 @@ def ONNXGreaterOp:ONNX_Op<"Greater",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXHardSigmoidOp:ONNX_Op<"HardSigmoid", 
@@ -1098,7 +1106,7 @@ def ONNXHardSigmoidOp:ONNX_Op<"HardSigmoid",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<F32Attr, "0.2">:$alpha,
            DefaultValuedAttr<F32Attr, "0.5">:$beta);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXHardmaxOp:ONNX_Op<"Hardmax", 
@@ -1122,7 +1130,7 @@ def ONNXHardmaxOp:ONNX_Op<"Hardmax",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "1">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXIdentityOp:ONNX_Op<"Identity", 
@@ -1133,7 +1141,7 @@ def ONNXIdentityOp:ONNX_Op<"Identity",
     "Identity operator"
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXIfOp:ONNX_Op<"If", 
@@ -1145,7 +1153,7 @@ def ONNXIfOp:ONNX_Op<"If",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$cond,
            AnyAttr:$else_branch,
            AnyAttr:$then_branch);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_outputs);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$outputs);
 }
 
 def ONNXInstanceNormalizationOp:ONNX_Op<"InstanceNormalization", 
@@ -1163,7 +1171,7 @@ def ONNXInstanceNormalizationOp:ONNX_Op<"InstanceNormalization",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$scale,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B,
            DefaultValuedAttr<F32Attr, "1e-05">:$epsilon);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXIsInfOp:ONNX_Op<"IsInf", 
@@ -1175,7 +1183,7 @@ def ONNXIsInfOp:ONNX_Op<"IsInf",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<I64Attr, "1">:$detect_negative,
            DefaultValuedAttr<I64Attr, "1">:$detect_positive);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXIsNaNOp:ONNX_Op<"IsNaN", 
@@ -1185,7 +1193,7 @@ def ONNXIsNaNOp:ONNX_Op<"IsNaN",
     "Returns which elements of the input are NaN."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXLRNOp:ONNX_Op<"LRN", 
@@ -1208,7 +1216,7 @@ def ONNXLRNOp:ONNX_Op<"LRN",
            DefaultValuedAttr<F32Attr, "0.75">:$beta,
            DefaultValuedAttr<F32Attr, "1.0">:$bias,
            I64Attr:$size);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXLSTMOp:ONNX_Op<"LSTM", 
@@ -1312,7 +1320,9 @@ def ONNXLSTMOp:ONNX_Op<"LSTM",
            DefaultValuedAttr<StrAttr, "forward">:$direction,
            OptionalAttr<I64Attr>:$hidden_size,
            DefaultValuedAttr<I64Attr, "0">:$input_forget);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y_h, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y_c);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y_h,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y_c);
 }
 
 def ONNXLeakyReluOp:ONNX_Op<"LeakyRelu", 
@@ -1325,7 +1335,7 @@ def ONNXLeakyReluOp:ONNX_Op<"LeakyRelu",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<F32Attr, "0.01">:$alpha);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXLessOp:ONNX_Op<"Less", 
@@ -1339,7 +1349,7 @@ def ONNXLessOp:ONNX_Op<"Less",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXLogOp:ONNX_Op<"Log", 
@@ -1349,7 +1359,7 @@ def ONNXLogOp:ONNX_Op<"Log",
     "Calculates the natural log of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXLogSoftmaxOp:ONNX_Op<"LogSoftmax", 
@@ -1373,7 +1383,7 @@ def ONNXLogSoftmaxOp:ONNX_Op<"LogSoftmax",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "1">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXLoopOp:ONNX_Op<"Loop", 
@@ -1518,7 +1528,7 @@ def ONNXLoopOp:ONNX_Op<"Loop",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$cond,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$v_initial,
            AnyAttr:$body);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_v_final_and_scan_outputs);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$v_final_and_scan_outputs);
 }
 
 def ONNXLpNormalizationOp:ONNX_Op<"LpNormalization", 
@@ -1530,7 +1540,7 @@ def ONNXLpNormalizationOp:ONNX_Op<"LpNormalization",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "-1">:$axis,
            DefaultValuedAttr<I64Attr, "2">:$p);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXLpPoolOp:ONNX_Op<"LpPool", 
@@ -1549,7 +1559,7 @@ def ONNXLpPoolOp:ONNX_Op<"LpPool",
            DefaultValuedAttr<I64Attr, "2">:$p,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXMatMulOp:ONNX_Op<"MatMul", 
@@ -1560,7 +1570,7 @@ def ONNXMatMulOp:ONNX_Op<"MatMul",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXMatMulIntegerOp:ONNX_Op<"MatMulInteger", 
@@ -1574,7 +1584,7 @@ def ONNXMatMulIntegerOp:ONNX_Op<"MatMulInteger",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$a_zero_point,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$b_zero_point);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXMaxOp:ONNX_Op<"Max", 
@@ -1586,7 +1596,7 @@ def ONNXMaxOp:ONNX_Op<"Max",
     "This operator supports **multidirectional (i.e., Numpy-style) broadcasting**; for more details please check [the doc](Broadcasting.md)."
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$data_0);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_max);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$max);
 }
 
 def ONNXMaxPoolOp:ONNX_Op<"MaxPool", 
@@ -1631,7 +1641,8 @@ def ONNXMaxPoolOp:ONNX_Op<"MaxPool",
            OptionalAttr<I64ArrayAttr>:$pads,
            DefaultValuedAttr<I64Attr, "0">:$storage_order,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Indices);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Indices);
 }
 
 def ONNXMaxRoiPoolOp:ONNX_Op<"MaxRoiPool", 
@@ -1646,7 +1657,7 @@ def ONNXMaxRoiPoolOp:ONNX_Op<"MaxRoiPool",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$rois,
            I64ArrayAttr:$pooled_shape,
            DefaultValuedAttr<F32Attr, "1.0">:$spatial_scale);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXMaxUnpoolOp:ONNX_Op<"MaxUnpool", 
@@ -1678,7 +1689,7 @@ def ONNXMaxUnpoolOp:ONNX_Op<"MaxUnpool",
            I64ArrayAttr:$kernel_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXMeanOp:ONNX_Op<"Mean", 
@@ -1690,7 +1701,7 @@ def ONNXMeanOp:ONNX_Op<"Mean",
     "This operator supports **multidirectional (i.e., Numpy-style) broadcasting**; for more details please check [the doc](Broadcasting.md)."
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$data_0);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_mean);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$mean);
 }
 
 def ONNXMeanVarianceNormalizationOp:ONNX_Op<"MeanVarianceNormalization", 
@@ -1702,7 +1713,7 @@ def ONNXMeanVarianceNormalizationOp:ONNX_Op<"MeanVarianceNormalization",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<I64ArrayAttr, "{0, 2, 3}">:$axes);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXMinOp:ONNX_Op<"Min", 
@@ -1714,7 +1725,7 @@ def ONNXMinOp:ONNX_Op<"Min",
     "This operator supports **multidirectional (i.e., Numpy-style) broadcasting**; for more details please check [the doc](Broadcasting.md)."
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$data_0);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_min);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$min);
 }
 
 def ONNXModOp:ONNX_Op<"Mod", 
@@ -1738,7 +1749,7 @@ def ONNXModOp:ONNX_Op<"Mod",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B,
            DefaultValuedAttr<I64Attr, "0">:$fmod);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXMulOp:ONNX_Op<"Mul", 
@@ -1751,7 +1762,7 @@ def ONNXMulOp:ONNX_Op<"Mul",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXMultinomialOp:ONNX_Op<"Multinomial", 
@@ -1765,7 +1776,7 @@ def ONNXMultinomialOp:ONNX_Op<"Multinomial",
            DefaultValuedAttr<I64Attr, "6">:$dtype,
            DefaultValuedAttr<I64Attr, "1">:$sample_size,
            OptionalAttr<F32Attr>:$seed);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXNegOp:ONNX_Op<"Neg", 
@@ -1777,7 +1788,7 @@ def ONNXNegOp:ONNX_Op<"Neg",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXNonMaxSuppressionOp:ONNX_Op<"NonMaxSuppression", 
@@ -1798,7 +1809,7 @@ def ONNXNonMaxSuppressionOp:ONNX_Op<"NonMaxSuppression",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$iou_threshold,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$score_threshold,
            DefaultValuedAttr<I64Attr, "0">:$center_point_box);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_selected_indices);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$selected_indices);
 }
 
 def ONNXNonZeroOp:ONNX_Op<"NonZero", 
@@ -1811,7 +1822,7 @@ def ONNXNonZeroOp:ONNX_Op<"NonZero",
     "    https://docs.scipy.org/doc/numpy/reference/generated/numpy.nonzero.html"
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXNotOp:ONNX_Op<"Not", 
@@ -1821,7 +1832,7 @@ def ONNXNotOp:ONNX_Op<"Not",
     "Returns the negation of the input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXOneHotOp:ONNX_Op<"OneHot", 
@@ -1852,7 +1863,7 @@ def ONNXOneHotOp:ONNX_Op<"OneHot",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$depth,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$values,
            DefaultValuedAttr<I64Attr, "-1">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXOrOp:ONNX_Op<"Or", 
@@ -1866,7 +1877,7 @@ def ONNXOrOp:ONNX_Op<"Or",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXPReluOp:ONNX_Op<"PRelu", 
@@ -1880,7 +1891,7 @@ def ONNXPReluOp:ONNX_Op<"PRelu",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$slope);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXPadOp:ONNX_Op<"Pad", 
@@ -1973,7 +1984,7 @@ def ONNXPadOp:ONNX_Op<"Pad",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$pads,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$constant_value,
            DefaultValuedAttr<StrAttr, "constant">:$mode);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXPowOp:ONNX_Op<"Pow", 
@@ -1987,7 +1998,7 @@ def ONNXPowOp:ONNX_Op<"Pow",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Z);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Z);
 }
 
 def ONNXQLinearConvOp:ONNX_Op<"QLinearConv", 
@@ -2015,7 +2026,7 @@ def ONNXQLinearConvOp:ONNX_Op<"QLinearConv",
            OptionalAttr<I64ArrayAttr>:$kernel_shape,
            OptionalAttr<I64ArrayAttr>:$pads,
            OptionalAttr<I64ArrayAttr>:$strides);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXQLinearMatMulOp:ONNX_Op<"QLinearMatMul", 
@@ -2039,7 +2050,7 @@ def ONNXQLinearMatMulOp:ONNX_Op<"QLinearMatMul",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$b_zero_point,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_scale,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_zero_point);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXQuantizeLinearOp:ONNX_Op<"QuantizeLinear", 
@@ -2053,7 +2064,7 @@ def ONNXQuantizeLinearOp:ONNX_Op<"QuantizeLinear",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$x,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_scale,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$y_zero_point);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$y);
 }
 
 def ONNXRNNOp:ONNX_Op<"RNN", 
@@ -2134,7 +2145,8 @@ def ONNXRNNOp:ONNX_Op<"RNN",
            OptionalAttr<F32Attr>:$clip,
            DefaultValuedAttr<StrAttr, "forward">:$direction,
            OptionalAttr<I64Attr>:$hidden_size);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y_h);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y_h);
 }
 
 def ONNXRandomNormalOp:ONNX_Op<"RandomNormal", 
@@ -2154,7 +2166,7 @@ def ONNXRandomNormalOp:ONNX_Op<"RandomNormal",
            DefaultValuedAttr<F32Attr, "1.0">:$scale,
            OptionalAttr<F32Attr>:$seed,
            I64ArrayAttr:$shape);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXRandomNormalLikeOp:ONNX_Op<"RandomNormalLike", 
@@ -2174,7 +2186,7 @@ def ONNXRandomNormalLikeOp:ONNX_Op<"RandomNormalLike",
            DefaultValuedAttr<F32Attr, "0.0">:$mean,
            DefaultValuedAttr<F32Attr, "1.0">:$scale,
            OptionalAttr<F32Attr>:$seed);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXRandomUniformOp:ONNX_Op<"RandomUniform", 
@@ -2193,7 +2205,7 @@ def ONNXRandomUniformOp:ONNX_Op<"RandomUniform",
            DefaultValuedAttr<F32Attr, "0.0">:$low,
            OptionalAttr<F32Attr>:$seed,
            I64ArrayAttr:$shape);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXRandomUniformLikeOp:ONNX_Op<"RandomUniformLike", 
@@ -2213,7 +2225,7 @@ def ONNXRandomUniformLikeOp:ONNX_Op<"RandomUniformLike",
            DefaultValuedAttr<F32Attr, "1.0">:$high,
            DefaultValuedAttr<F32Attr, "0.0">:$low,
            OptionalAttr<F32Attr>:$seed);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXRangeOp:ONNX_Op<"Range", 
@@ -2249,7 +2261,7 @@ def ONNXRangeOp:ONNX_Op<"Range",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$start,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$limit,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$delta);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXReciprocalOp:ONNX_Op<"Reciprocal", 
@@ -2261,7 +2273,7 @@ def ONNXReciprocalOp:ONNX_Op<"Reciprocal",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXReduceL1Op:ONNX_Op<"ReduceL1", 
@@ -2279,7 +2291,7 @@ def ONNXReduceL1Op:ONNX_Op<"ReduceL1",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceL2Op:ONNX_Op<"ReduceL2", 
@@ -2297,7 +2309,7 @@ def ONNXReduceL2Op:ONNX_Op<"ReduceL2",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceLogSumOp:ONNX_Op<"ReduceLogSum", 
@@ -2315,7 +2327,7 @@ def ONNXReduceLogSumOp:ONNX_Op<"ReduceLogSum",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceLogSumExpOp:ONNX_Op<"ReduceLogSumExp", 
@@ -2333,7 +2345,7 @@ def ONNXReduceLogSumExpOp:ONNX_Op<"ReduceLogSumExp",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceMaxOp:ONNX_Op<"ReduceMax", 
@@ -2350,7 +2362,7 @@ def ONNXReduceMaxOp:ONNX_Op<"ReduceMax",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceMeanOp:ONNX_Op<"ReduceMean", 
@@ -2367,7 +2379,7 @@ def ONNXReduceMeanOp:ONNX_Op<"ReduceMean",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceMinOp:ONNX_Op<"ReduceMin", 
@@ -2384,7 +2396,7 @@ def ONNXReduceMinOp:ONNX_Op<"ReduceMin",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceProdOp:ONNX_Op<"ReduceProd", 
@@ -2401,7 +2413,7 @@ def ONNXReduceProdOp:ONNX_Op<"ReduceProd",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceSumOp:ONNX_Op<"ReduceSum", 
@@ -2418,7 +2430,7 @@ def ONNXReduceSumOp:ONNX_Op<"ReduceSum",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReduceSumSquareOp:ONNX_Op<"ReduceSumSquare", 
@@ -2436,7 +2448,7 @@ def ONNXReduceSumSquareOp:ONNX_Op<"ReduceSumSquare",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reduced);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reduced);
 }
 
 def ONNXReluOp:ONNX_Op<"Relu", 
@@ -2448,7 +2460,7 @@ def ONNXReluOp:ONNX_Op<"Relu",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXReshapeOp:ONNX_Op<"Reshape", 
@@ -2464,7 +2476,7 @@ def ONNXReshapeOp:ONNX_Op<"Reshape",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$shape);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_reshaped);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$reshaped);
 }
 
 def ONNXResizeOp:ONNX_Op<"Resize", 
@@ -2485,7 +2497,7 @@ def ONNXResizeOp:ONNX_Op<"Resize",
            DefaultValuedAttr<F32Attr, "0.0">:$extrapolation_value,
            DefaultValuedAttr<StrAttr, "nearest">:$mode,
            DefaultValuedAttr<StrAttr, "round_prefer_floor">:$nearest_mode);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXReverseSequenceOp:ONNX_Op<"ReverseSequence", 
@@ -2530,7 +2542,7 @@ def ONNXReverseSequenceOp:ONNX_Op<"ReverseSequence",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$sequence_lens,
            DefaultValuedAttr<I64Attr, "1">:$batch_axis,
            DefaultValuedAttr<I64Attr, "0">:$time_axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXRoiAlignOp:ONNX_Op<"RoiAlign", 
@@ -2557,7 +2569,7 @@ def ONNXRoiAlignOp:ONNX_Op<"RoiAlign",
            DefaultValuedAttr<I64Attr, "1">:$output_width,
            DefaultValuedAttr<I64Attr, "0">:$sampling_ratio,
            DefaultValuedAttr<F32Attr, "1.0">:$spatial_scale);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXRoundOp:ONNX_Op<"Round", 
@@ -2579,7 +2591,7 @@ def ONNXRoundOp:ONNX_Op<"Round",
     "```"
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXScanOp:ONNX_Op<"Scan", 
@@ -2715,7 +2727,7 @@ def ONNXScanOp:ONNX_Op<"Scan",
            OptionalAttr<I64ArrayAttr>:$scan_input_directions,
            OptionalAttr<I64ArrayAttr>:$scan_output_axes,
            OptionalAttr<I64ArrayAttr>:$scan_output_directions);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_final_state_and_scan_outputs);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$final_state_and_scan_outputs);
 }
 
 def ONNXScatterOp:ONNX_Op<"Scatter", 
@@ -2780,7 +2792,7 @@ def ONNXScatterOp:ONNX_Op<"Scatter",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$updates,
            DefaultValuedAttr<I64Attr, "0">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXScatterElementsOp:ONNX_Op<"ScatterElements", 
@@ -2843,7 +2855,7 @@ def ONNXScatterElementsOp:ONNX_Op<"ScatterElements",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$updates,
            DefaultValuedAttr<I64Attr, "0">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXScatterNDOp:ONNX_Op<"ScatterND", 
@@ -2910,7 +2922,7 @@ def ONNXScatterNDOp:ONNX_Op<"ScatterND",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$updates);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSeluOp:ONNX_Op<"Selu", 
@@ -2925,7 +2937,7 @@ def ONNXSeluOp:ONNX_Op<"Selu",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<F32Attr, "1.67326">:$alpha,
            DefaultValuedAttr<F32Attr, "1.0507">:$gamma);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXSequenceAtOp:ONNX_Op<"SequenceAt", 
@@ -2938,7 +2950,7 @@ def ONNXSequenceAtOp:ONNX_Op<"SequenceAt",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input_sequence,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$position);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_tensor);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$tensor);
 }
 
 def ONNXSequenceConstructOp:ONNX_Op<"SequenceConstruct", 
@@ -2949,7 +2961,7 @@ def ONNXSequenceConstructOp:ONNX_Op<"SequenceConstruct",
     "All tensors in 'inputs' must have the same data type."
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$inputs);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output_sequence);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output_sequence);
 }
 
 def ONNXSequenceEmptyOp:ONNX_Op<"SequenceEmpty", 
@@ -2959,7 +2971,7 @@ def ONNXSequenceEmptyOp:ONNX_Op<"SequenceEmpty",
     "Construct an empty tensor sequence, with given data type."
   }];
   let arguments = (ins OptionalAttr<I64Attr>:$dtype);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSequenceEraseOp:ONNX_Op<"SequenceErase", 
@@ -2973,7 +2985,7 @@ def ONNXSequenceEraseOp:ONNX_Op<"SequenceErase",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input_sequence,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$position);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output_sequence);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output_sequence);
 }
 
 def ONNXSequenceInsertOp:ONNX_Op<"SequenceInsert", 
@@ -2989,7 +3001,7 @@ def ONNXSequenceInsertOp:ONNX_Op<"SequenceInsert",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input_sequence,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$tensor,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$position);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output_sequence);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output_sequence);
 }
 
 def ONNXSequenceLengthOp:ONNX_Op<"SequenceLength", 
@@ -2999,7 +3011,7 @@ def ONNXSequenceLengthOp:ONNX_Op<"SequenceLength",
     "Produces a scalar(tensor of empty shape) containing the number of tensors in 'input_sequence'."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input_sequence);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_length);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$length);
 }
 
 def ONNXShapeOp:ONNX_Op<"Shape", 
@@ -3009,7 +3021,7 @@ def ONNXShapeOp:ONNX_Op<"Shape",
     "Takes a tensor as input and outputs an 1D int64 tensor containing the shape of the input tensor."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_shape);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$shape);
 }
 
 def ONNXShrinkOp:ONNX_Op<"Shrink", 
@@ -3024,7 +3036,7 @@ def ONNXShrinkOp:ONNX_Op<"Shrink",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<F32Attr, "0.0">:$bias,
            DefaultValuedAttr<F32Attr, "0.5">:$lambd);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSigmoidOp:ONNX_Op<"Sigmoid", 
@@ -3036,7 +3048,7 @@ def ONNXSigmoidOp:ONNX_Op<"Sigmoid",
     "tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXSignOp:ONNX_Op<"Sign", 
@@ -3047,7 +3059,7 @@ def ONNXSignOp:ONNX_Op<"Sign",
     "If input > 0, output 1. if input < 0, output -1. if input == 0, output 0."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSinOp:ONNX_Op<"Sin", 
@@ -3057,7 +3069,7 @@ def ONNXSinOp:ONNX_Op<"Sin",
     "Calculates the sine of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSinhOp:ONNX_Op<"Sinh", 
@@ -3067,7 +3079,7 @@ def ONNXSinhOp:ONNX_Op<"Sinh",
     "Calculates the hyperbolic sine of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSizeOp:ONNX_Op<"Size", 
@@ -3077,7 +3089,7 @@ def ONNXSizeOp:ONNX_Op<"Size",
     "Takes a tensor as input and outputs a int64 scalar that equals to the total number of elements of the input tensor."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_size);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$size);
 }
 
 def ONNXSliceOp:ONNX_Op<"Slice", 
@@ -3124,7 +3136,7 @@ def ONNXSliceOp:ONNX_Op<"Slice",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$ends,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$axes,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$steps);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSoftmaxOp:ONNX_Op<"Softmax", 
@@ -3148,7 +3160,7 @@ def ONNXSoftmaxOp:ONNX_Op<"Softmax",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "1">:$axis);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSoftplusOp:ONNX_Op<"Softplus", 
@@ -3160,7 +3172,7 @@ def ONNXSoftplusOp:ONNX_Op<"Softplus",
     "the tensor elementwise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXSoftsignOp:ONNX_Op<"Softsign", 
@@ -3170,7 +3182,7 @@ def ONNXSoftsignOp:ONNX_Op<"Softsign",
     "Calculates the softsign (x/(1+|x|)) of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSpaceToDepthOp:ONNX_Op<"SpaceToDepth", 
@@ -3183,7 +3195,7 @@ def ONNXSpaceToDepthOp:ONNX_Op<"SpaceToDepth",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            I64Attr:$blocksize);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXSplitOp:ONNX_Op<"Split", 
@@ -3197,7 +3209,7 @@ def ONNXSplitOp:ONNX_Op<"Split",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            DefaultValuedAttr<I64Attr, "0">:$axis,
            OptionalAttr<I64ArrayAttr>:$split);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_outputs);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$outputs);
 }
 
 def ONNXSplitToSequenceOp:ONNX_Op<"SplitToSequence", 
@@ -3219,7 +3231,7 @@ def ONNXSplitToSequenceOp:ONNX_Op<"SplitToSequence",
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$split,
            DefaultValuedAttr<I64Attr, "0">:$axis,
            DefaultValuedAttr<I64Attr, "1">:$keepdims);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output_sequence);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output_sequence);
 }
 
 def ONNXSqrtOp:ONNX_Op<"Sqrt", 
@@ -3231,7 +3243,7 @@ def ONNXSqrtOp:ONNX_Op<"Sqrt",
     "the tensor elementwise. If x is negative, then it will return NaN."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXSqueezeOp:ONNX_Op<"Squeeze", 
@@ -3245,7 +3257,7 @@ def ONNXSqueezeOp:ONNX_Op<"Squeeze",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$axes);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_squeezed);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$squeezed);
 }
 
 def ONNXStringNormalizerOp:ONNX_Op<"StringNormalizer", 
@@ -3267,7 +3279,7 @@ def ONNXStringNormalizerOp:ONNX_Op<"StringNormalizer",
            DefaultValuedAttr<I64Attr, "0">:$is_case_sensitive,
            OptionalAttr<StrAttr>:$locale,
            OptionalAttr<StrArrayAttr>:$stopwords);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXSubOp:ONNX_Op<"Sub", 
@@ -3280,7 +3292,7 @@ def ONNXSubOp:ONNX_Op<"Sub",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }
 
 def ONNXSumOp:ONNX_Op<"Sum", 
@@ -3292,7 +3304,7 @@ def ONNXSumOp:ONNX_Op<"Sum",
     "This operator supports **multidirectional (i.e., Numpy-style) broadcasting**; for more details please check [the doc](Broadcasting.md)."
   }];
   let arguments = (ins Variadic<AnyTypeOf<[AnyMemRef, AnyTensor]>>:$data_0);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_sum);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$sum);
 }
 
 def ONNXTanOp:ONNX_Op<"Tan", 
@@ -3302,7 +3314,7 @@ def ONNXTanOp:ONNX_Op<"Tan",
     "Calculates the tangent of the given input tensor, element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXTanhOp:ONNX_Op<"Tanh", 
@@ -3312,7 +3324,7 @@ def ONNXTanhOp:ONNX_Op<"Tanh",
     "Calculates the hyperbolic tangent of the given input tensor element-wise."
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXTfIdfVectorizerOp:ONNX_Op<"TfIdfVectorizer", 
@@ -3357,7 +3369,7 @@ def ONNXTfIdfVectorizerOp:ONNX_Op<"TfIdfVectorizer",
            OptionalAttr<I64ArrayAttr>:$pool_int64s,
            OptionalAttr<StrArrayAttr>:$pool_strings,
            OptionalAttr<F32ArrayAttr>:$weights);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXThresholdedReluOp:ONNX_Op<"ThresholdedRelu", 
@@ -3370,7 +3382,7 @@ def ONNXThresholdedReluOp:ONNX_Op<"ThresholdedRelu",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            DefaultValuedAttr<F32Attr, "1.0">:$alpha);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXTileOp:ONNX_Op<"Tile", 
@@ -3383,7 +3395,7 @@ def ONNXTileOp:ONNX_Op<"Tile",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$input,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$repeats);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXTopKOp:ONNX_Op<"TopK", 
@@ -3410,7 +3422,8 @@ def ONNXTopKOp:ONNX_Op<"TopK",
            DefaultValuedAttr<I64Attr, "-1">:$axis,
            DefaultValuedAttr<I64Attr, "1">:$largest,
            DefaultValuedAttr<I64Attr, "1">:$sorted);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Values, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Indices);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Values,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$Indices);
 }
 
 def ONNXTransposeOp:ONNX_Op<"Transpose", 
@@ -3423,7 +3436,7 @@ def ONNXTransposeOp:ONNX_Op<"Transpose",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            OptionalAttr<I64ArrayAttr>:$perm);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_transposed);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$transposed);
 }
 
 def ONNXUniqueOp:ONNX_Op<"Unique", 
@@ -3509,7 +3522,10 @@ def ONNXUniqueOp:ONNX_Op<"Unique",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            OptionalAttr<I64Attr>:$axis,
            DefaultValuedAttr<I64Attr, "1">:$sorted);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_indices, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_inverse_indices, AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_counts);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$indices,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$inverse_indices,
+           AnyTypeOf<[AnyMemRef, AnyTensor]>:$counts);
 }
 
 def ONNXUnsqueezeOp:ONNX_Op<"Unsqueeze", 
@@ -3531,7 +3547,7 @@ def ONNXUnsqueezeOp:ONNX_Op<"Unsqueeze",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$data,
            I64ArrayAttr:$axes);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_expanded);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$expanded);
 }
 
 def ONNXUpsampleOp:ONNX_Op<"Upsample", 
@@ -3545,7 +3561,7 @@ def ONNXUpsampleOp:ONNX_Op<"Upsample",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$scales,
            DefaultValuedAttr<StrAttr, "nearest">:$mode);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_Y);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
 }
 
 def ONNXWhereOp:ONNX_Op<"Where", 
@@ -3560,7 +3576,7 @@ def ONNXWhereOp:ONNX_Op<"Where",
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$condition,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$X,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$Y);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_output);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$output);
 }
 
 def ONNXXorOp:ONNX_Op<"Xor", 
@@ -3574,5 +3590,5 @@ def ONNXXorOp:ONNX_Op<"Xor",
   }];
   let arguments = (ins AnyTypeOf<[AnyMemRef, AnyTensor]>:$A,
            AnyTypeOf<[AnyMemRef, AnyTensor]>:$B);
-  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$o_C);
+  let results = (outs AnyTypeOf<[AnyMemRef, AnyTensor]>:$C);
 }