diff --git a/res/TensorFlowLiteRecipes/All_000/test.recipe b/res/TensorFlowLiteRecipes/All_000/test.recipe
index 5a44082149f..38187222f32 100644
--- a/res/TensorFlowLiteRecipes/All_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/All_000/test.recipe
@@ -18,7 +18,7 @@ operand {
   }
 }
 operation {
-  type: "All"
+  type: "Custom"
   all_options {
     keep_dims: false
   }
@@ -26,7 +26,6 @@ operation {
   input: "All/reduction_indices"
   output: "ofm"
   custom_code: "All"
-  extype: "Custom"
 }
 input: "ifm"
 output: "ofm"
diff --git a/res/TensorFlowLiteRecipes/BatchMatMulV2_000/test.recipe b/res/TensorFlowLiteRecipes/BatchMatMulV2_000/test.recipe
index c04a6a3b43b..9af38a66e27 100644
--- a/res/TensorFlowLiteRecipes/BatchMatMulV2_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/BatchMatMulV2_000/test.recipe
@@ -14,12 +14,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 4 dim: 4 }
 }
 operation {
-  type: "BatchMatMulV2"
+  type: "Custom"
   input: "ifm1"
   input: "ifm2"
   output: "ofm"
   custom_code: "BatchMatMulV2"
-  extype: "Custom"
 }
 input: "ifm1"
 input: "ifm2"
diff --git a/res/TensorFlowLiteRecipes/BatchMatMulV2_001/test.recipe b/res/TensorFlowLiteRecipes/BatchMatMulV2_001/test.recipe
index 1b17396620b..9c5ca9f5b9d 100644
--- a/res/TensorFlowLiteRecipes/BatchMatMulV2_001/test.recipe
+++ b/res/TensorFlowLiteRecipes/BatchMatMulV2_001/test.recipe
@@ -14,7 +14,7 @@ operand {
   shape { dim: 2 dim: 2 dim: 2 dim: 4 }
 }
 operation {
-  type: "BatchMatMulV2"
+  type: "Custom"
   batch_matmul_options {
       adj_x : true
   }
@@ -22,7 +22,6 @@ operation {
   input: "ifm2"
   output: "ofm"
   custom_code: "BatchMatMulV2"
-  extype: "Custom"
 }
 input: "ifm1"
 input: "ifm2"
diff --git a/res/TensorFlowLiteRecipes/BroadcastTo_000/test.recipe b/res/TensorFlowLiteRecipes/BroadcastTo_000/test.recipe
index 0fb9da8bc55..4365e084639 100644
--- a/res/TensorFlowLiteRecipes/BroadcastTo_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/BroadcastTo_000/test.recipe
@@ -15,12 +15,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 3 }
 }
 operation {
-  type: "BroadcastTo"
+  type: "Custom"
   input: "bc_input"
   input: "bc_shape"
   output: "bc_ofm"
   custom_code: "BroadcastTo"
-  extype: "Custom"
 }
 input: "bc_input"
 output: "bc_ofm"
diff --git a/res/TensorFlowLiteRecipes/MatMul_000/test.recipe b/res/TensorFlowLiteRecipes/MatMul_000/test.recipe
index 9502cb3b75f..69564f1988e 100644
--- a/res/TensorFlowLiteRecipes/MatMul_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/MatMul_000/test.recipe
@@ -14,7 +14,7 @@ operand {
   shape { dim: 3 dim: 3 }
 }
 operation {
-  type: "MatMul"
+  type: "Custom"
   input: "ifm1"
   input: "ifm2"
   output: "ofm"
@@ -23,7 +23,6 @@ operation {
     transpose_b: false
   }
   custom_code: "MatMul"
-  extype: "Custom"
 }
 input: "ifm1"
 input: "ifm2"
diff --git a/res/TensorFlowLiteRecipes/MatrixBandPart_000/test.recipe b/res/TensorFlowLiteRecipes/MatrixBandPart_000/test.recipe
index 7ffdaac9077..0d17289a7fa 100644
--- a/res/TensorFlowLiteRecipes/MatrixBandPart_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/MatrixBandPart_000/test.recipe
@@ -27,13 +27,12 @@ operand {
   shape { dim: 4 dim: 4 }
 }
 operation {
-  type: "MatrixBandPart"
+  type: "Custom"
   input: "ifm"
   input: "MatrixBandPart/num_lower"
   input: "MatrixBandPart/num_upper"
   output: "ofm"
   custom_code: "MatrixBandPart"
-  extype: "Custom"
 }
 input: "ifm"
 output: "ofm"
diff --git a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_000/test.recipe b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_000/test.recipe
index 5dba4979548..d618a6fa10d 100644
--- a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_000/test.recipe
@@ -14,7 +14,7 @@ operand {
   shape { dim: 1 dim: 9 dim: 9 dim: 1 }
 }
 operation {
-  type: "MaxPoolWithArgmax"
+  type: "Custom"
   input: "ifm"
   output: "ofm"
   output: "argmax"
@@ -28,7 +28,6 @@ operation {
     include_batch_in_index: false
   }
   custom_code: "MaxPoolWithArgmax"
-  extype: "Custom"
 }
 input: "ifm"
 output: "ofm"
diff --git a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_001/test.recipe b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_001/test.recipe
index cdbd2456076..4b85f55ddf7 100644
--- a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_001/test.recipe
+++ b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_001/test.recipe
@@ -14,7 +14,7 @@ operand {
   shape { dim: 1 dim: 9 dim: 9 dim: 1 }
 }
 operation {
-  type: "MaxPoolWithArgmax"
+  type: "Custom"
   input: "ifm"
   output: "ofm"
   output: "argmax"
@@ -28,7 +28,6 @@ operation {
     include_batch_in_index: false
   }
   custom_code: "MaxPoolWithArgmax"
-  extype: "Custom"
 }
 input: "ifm"
 output: "ofm"
diff --git a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_002/test.recipe b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_002/test.recipe
index f0d7d4ec1f3..ad0ca7c6699 100644
--- a/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_002/test.recipe
+++ b/res/TensorFlowLiteRecipes/MaxPoolWithArgmax_002/test.recipe
@@ -14,7 +14,7 @@ operand {
   shape { dim: 1 dim: 8 dim: 8 dim: 2 }
 }
 operation {
-  type: "MaxPoolWithArgmax"
+  type: "Custom"
   input: "ifm"
   output: "ofm"
   output: "argmax"
@@ -28,7 +28,6 @@ operation {
     include_batch_in_index: false
   }
   custom_code: "MaxPoolWithArgmax"
-  extype: "Custom"
 }
 input: "ifm"
 output: "ofm"
diff --git a/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_000/test.recipe b/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_000/test.recipe
index 09c1106729a..a3a1105df9d 100644
--- a/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_000/test.recipe
@@ -15,12 +15,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 3 }
 }
 operation {
-  type: "BroadcastTo"
+  type: "Custom"
   input: "bc_input"
   input: "bc_shape"
   output: "bc_ofm"
   custom_code: "BroadcastTo"
-  extype: "Custom"
 }
 operand {
   name: "reshape_data"
@@ -55,12 +54,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 3 }
 }
 operation {
-  type: "AddV2"
+  type: "Custom"
   input: "bc_ofm"
   input: "reshape_ofm"
   output: "ofm"
   custom_code: "AddV2"
-  extype: "Custom"
 }
 input: "bc_input"
 input: "reshape_data"
diff --git a/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_001/test.recipe b/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_001/test.recipe
index 69a651bb82b..2a637588171 100644
--- a/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_001/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_BroadcastTo_AddV2_001/test.recipe
@@ -15,12 +15,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 3 }
 }
 operation {
-  type: "BroadcastTo"
+  type: "Custom"
   input: "bc_input"
   input: "bc_shape"
   output: "bc_ofm"
   custom_code: "BroadcastTo"
-  extype: "Custom"
 }
 operand {
   name: "reshape_data"
@@ -55,12 +54,11 @@ operand {
   shape { dim: 1 dim: 2 dim: 3 }
 }
 operation {
-  type: "AddV2"
+  type: "Custom"
   input: "bc_ofm"
   input: "reshape_ofm"
   output: "ofm"
   custom_code: "AddV2"
-  extype: "Custom"
 }
 input: "bc_input"
 input: "reshape_data"
diff --git a/res/TensorFlowLiteRecipes/Net_FC_Gelu_FC_000/test.recipe b/res/TensorFlowLiteRecipes/Net_FC_Gelu_FC_000/test.recipe
index 703f450dbf5..db3c106e16a 100644
--- a/res/TensorFlowLiteRecipes/Net_FC_Gelu_FC_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_FC_Gelu_FC_000/test.recipe
@@ -101,11 +101,10 @@ operation {
   output: "fc2"
 }
 operation {
-  type: "Erf"
+  type: "Custom"
   input: "fc2"
   output: "erf"
   custom_code: "Erf"
-  extype: "Custom"
 }
 operation {
   type: "Add"
diff --git a/res/TensorFlowLiteRecipes/Net_Gather_SparseToDense_AddV2_000/test.recipe b/res/TensorFlowLiteRecipes/Net_Gather_SparseToDense_AddV2_000/test.recipe
index 326836fd1ab..31a725193d4 100644
--- a/res/TensorFlowLiteRecipes/Net_Gather_SparseToDense_AddV2_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_Gather_SparseToDense_AddV2_000/test.recipe
@@ -99,12 +99,11 @@ operation {
   output: "ofm_sparse"
 }
 operation {
-  type: "AddV2"
+  type: "Custom"
   input: "ofm_sparse"
   input: "add_v2_2"
   output: "ofm_add_v2"
   custom_code: "AddV2"
-  extype: "Custom"
 }
 operation {
   type: "Cast"
diff --git a/res/TensorFlowLiteRecipes/Net_Gelu_000/test.recipe b/res/TensorFlowLiteRecipes/Net_Gelu_000/test.recipe
index 6285bc1c81a..73816c33dae 100644
--- a/res/TensorFlowLiteRecipes/Net_Gelu_000/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_Gelu_000/test.recipe
@@ -65,11 +65,10 @@ operation {
   }
 }
 operation {
-  type: "Erf"
+  type: "Custom"
   input: "mul_sqrt"
   output: "erf"
   custom_code: "Erf"
-  extype: "Custom"
 }
 operation {
   type: "Add"
diff --git a/res/TensorFlowLiteRecipes/Net_Gelu_001/test.recipe b/res/TensorFlowLiteRecipes/Net_Gelu_001/test.recipe
index eddf6c62de7..957ccc1787c 100644
--- a/res/TensorFlowLiteRecipes/Net_Gelu_001/test.recipe
+++ b/res/TensorFlowLiteRecipes/Net_Gelu_001/test.recipe
@@ -65,11 +65,10 @@ operation {
   }
 }
 operation {
-  type: "Erf"
+  type: "Custom"
   input: "mul_sqrt"
   output: "erf"
   custom_code: "Erf"
-  extype: "Custom"
 }
 operation {
   type: "Add"