Rename setInputsAndOutputs

To avoid confusion with other set* functions, rename setInputsAndOutputs
to identifyInputsAndOutputs.

Also added a few new generated tests when I reran generate_test.sh.

Bug: 63905942
Test: local & VTS tests
Change-Id: Ie947044bee1a97426c847b9d66e60f0c25395bbc
diff --git a/nn/runtime/test/generated/models/add.model.cpp b/nn/runtime/test/generated/models/add.model.cpp
index 3382499..e8b3aa1 100644
--- a/nn/runtime/test/generated/models/add.model.cpp
+++ b/nn/runtime/test/generated/models/add.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_ADD, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/add_broadcast_quant8.model.cpp b/nn/runtime/test/generated/models/add_broadcast_quant8.model.cpp
index ca7c377..3dd6f3f 100644
--- a/nn/runtime/test/generated/models/add_broadcast_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/add_broadcast_quant8.model.cpp
@@ -13,7 +13,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_ADD, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/add_quant8.model.cpp b/nn/runtime/test/generated/models/add_quant8.model.cpp
index 7ca4840..57c7c57 100644
--- a/nn/runtime/test/generated/models/add_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/add_quant8.model.cpp
@@ -13,7 +13,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_ADD, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_float_1.model.cpp b/nn/runtime/test/generated/models/avg_pool_float_1.model.cpp
index 87bca77..9f3b02e 100644
--- a/nn/runtime/test/generated/models/avg_pool_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_float_1.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_float_2.model.cpp b/nn/runtime/test/generated/models/avg_pool_float_2.model.cpp
index afcbffe..f6f2e5b 100644
--- a/nn/runtime/test/generated/models/avg_pool_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_float_2.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_float_3.model.cpp b/nn/runtime/test/generated/models/avg_pool_float_3.model.cpp
index d9a2cc5..c056c61 100644
--- a/nn/runtime/test/generated/models/avg_pool_float_3.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_float_3.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_float_4.model.cpp b/nn/runtime/test/generated/models/avg_pool_float_4.model.cpp
index 33f7dc8..d3b6133 100644
--- a/nn/runtime/test/generated/models/avg_pool_float_4.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_float_4.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(relu6_activation, relu6_activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, relu6_activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_quant8_1.model.cpp b/nn/runtime/test/generated/models/avg_pool_quant8_1.model.cpp
index 8a85eb3..c14c383 100644
--- a/nn/runtime/test/generated/models/avg_pool_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_quant8_1.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_quant8_2.model.cpp b/nn/runtime/test/generated/models/avg_pool_quant8_2.model.cpp
index ede7365..0d346d4 100644
--- a/nn/runtime/test/generated/models/avg_pool_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_quant8_2.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_quant8_3.model.cpp b/nn/runtime/test/generated/models/avg_pool_quant8_3.model.cpp
index 2e2d4b1..4bcab8f 100644
--- a/nn/runtime/test/generated/models/avg_pool_quant8_3.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_quant8_3.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/avg_pool_quant8_4.model.cpp b/nn/runtime/test/generated/models/avg_pool_quant8_4.model.cpp
index b390b68..9981387 100644
--- a/nn/runtime/test/generated/models/avg_pool_quant8_4.model.cpp
+++ b/nn/runtime/test/generated/models/avg_pool_quant8_4.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(relu1_activitation, relu1_activitation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_AVERAGE_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, relu1_activitation}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_float_1.model.cpp b/nn/runtime/test/generated/models/concat_float_1.model.cpp
index 8a6c0c3..a40506d 100644
--- a/nn/runtime/test/generated/models/concat_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/concat_float_1.model.cpp
@@ -13,7 +13,7 @@
   model->setOperandValue(axis0, axis0_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {op1, op2, axis0}, {result});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {result});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_float_2.model.cpp b/nn/runtime/test/generated/models/concat_float_2.model.cpp
index a822531..2938a1a 100644
--- a/nn/runtime/test/generated/models/concat_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/concat_float_2.model.cpp
@@ -14,7 +14,7 @@
   model->setOperandValue(axis0, axis0_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {input1, input2, axis0}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input1, input2},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_float_3.model.cpp b/nn/runtime/test/generated/models/concat_float_3.model.cpp
index 8caff55..ac5cc8f 100644
--- a/nn/runtime/test/generated/models/concat_float_3.model.cpp
+++ b/nn/runtime/test/generated/models/concat_float_3.model.cpp
@@ -14,7 +14,7 @@
   model->setOperandValue(axis1, axis1_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {input1, input2, axis1}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input1, input2},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_quant8_1.model.cpp b/nn/runtime/test/generated/models/concat_quant8_1.model.cpp
index c8c4c81..ab377d6 100644
--- a/nn/runtime/test/generated/models/concat_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/concat_quant8_1.model.cpp
@@ -13,7 +13,7 @@
   model->setOperandValue(axis1, axis1_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {op1, op2, axis1}, {result});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {result});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_quant8_2.model.cpp b/nn/runtime/test/generated/models/concat_quant8_2.model.cpp
index e327428..286b5d8 100644
--- a/nn/runtime/test/generated/models/concat_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/concat_quant8_2.model.cpp
@@ -14,7 +14,7 @@
   model->setOperandValue(axis0, axis0_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {input1, input2, axis0}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input1, input2},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/concat_quant8_3.model.cpp b/nn/runtime/test/generated/models/concat_quant8_3.model.cpp
index b90f0a4..085c0d9 100644
--- a/nn/runtime/test/generated/models/concat_quant8_3.model.cpp
+++ b/nn/runtime/test/generated/models/concat_quant8_3.model.cpp
@@ -14,7 +14,7 @@
   model->setOperandValue(axis1, axis1_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONCATENATION, {input1, input2, axis1}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input1, input2},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_1_h3_w2_SAME.model.cpp b/nn/runtime/test/generated/models/conv_1_h3_w2_SAME.model.cpp
index b12ede5..82fe118 100644
--- a/nn/runtime/test/generated/models/conv_1_h3_w2_SAME.model.cpp
+++ b/nn/runtime/test/generated/models/conv_1_h3_w2_SAME.model.cpp
@@ -31,7 +31,7 @@
   model->setOperandValue(op1, op1_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op2, op0, op1, pad0, pad1, pad1, pad1, b5, b6, b7}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_1_h3_w2_VALID.model.cpp b/nn/runtime/test/generated/models/conv_1_h3_w2_VALID.model.cpp
index 198db9b..7d9634d 100644
--- a/nn/runtime/test/generated/models/conv_1_h3_w2_VALID.model.cpp
+++ b/nn/runtime/test/generated/models/conv_1_h3_w2_VALID.model.cpp
@@ -28,7 +28,7 @@
   model->setOperandValue(op1, op1_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op2, op0, op1, pad0, pad0, pad0, pad0, b5, b6, b7}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_3_h3_w2_SAME.model.cpp b/nn/runtime/test/generated/models/conv_3_h3_w2_SAME.model.cpp
index a3ae5a5..dec8578 100644
--- a/nn/runtime/test/generated/models/conv_3_h3_w2_SAME.model.cpp
+++ b/nn/runtime/test/generated/models/conv_3_h3_w2_SAME.model.cpp
@@ -30,7 +30,7 @@
   model->setOperandValue(op1, op1_init, sizeof(float) * 3);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op2, op0, op1, pad0, pad1, pad1, pad1, b5, b6, b7}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_3_h3_w2_VALID.model.cpp b/nn/runtime/test/generated/models/conv_3_h3_w2_VALID.model.cpp
index 58e4e2e..c6cbb0a 100644
--- a/nn/runtime/test/generated/models/conv_3_h3_w2_VALID.model.cpp
+++ b/nn/runtime/test/generated/models/conv_3_h3_w2_VALID.model.cpp
@@ -28,7 +28,7 @@
   model->setOperandValue(op1, op1_init, sizeof(float) * 3);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op2, op0, op1, pad0, pad0, pad0, pad0, b5, b6, b7}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_float.model.cpp b/nn/runtime/test/generated/models/conv_float.model.cpp
index 1264c09..b179b3b 100644
--- a/nn/runtime/test/generated/models/conv_float.model.cpp
+++ b/nn/runtime/test/generated/models/conv_float.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_float_channels.model.cpp b/nn/runtime/test/generated/models/conv_float_channels.model.cpp
index 6265bea..bbcfd29 100644
--- a/nn/runtime/test/generated/models/conv_float_channels.model.cpp
+++ b/nn/runtime/test/generated/models/conv_float_channels.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_float_large.model.cpp b/nn/runtime/test/generated/models/conv_float_large.model.cpp
index d30b80d..c629c06 100644
--- a/nn/runtime/test/generated/models/conv_float_large.model.cpp
+++ b/nn/runtime/test/generated/models/conv_float_large.model.cpp
@@ -22,7 +22,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_quant8.model.cpp b/nn/runtime/test/generated/models/conv_quant8.model.cpp
index 4da65fc..46a62a3 100644
--- a/nn/runtime/test/generated/models/conv_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/conv_quant8.model.cpp
@@ -22,7 +22,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_quant8_channels.model.cpp b/nn/runtime/test/generated/models/conv_quant8_channels.model.cpp
index 031b007..04b9bed 100644
--- a/nn/runtime/test/generated/models/conv_quant8_channels.model.cpp
+++ b/nn/runtime/test/generated/models/conv_quant8_channels.model.cpp
@@ -22,7 +22,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_quant8_large.model.cpp b/nn/runtime/test/generated/models/conv_quant8_large.model.cpp
index c16ab23..7bd13d6 100644
--- a/nn/runtime/test/generated/models/conv_quant8_large.model.cpp
+++ b/nn/runtime/test/generated/models/conv_quant8_large.model.cpp
@@ -22,7 +22,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/conv_quant8_overflow.model.cpp b/nn/runtime/test/generated/models/conv_quant8_overflow.model.cpp
index ac3dc6a..960233a 100644
--- a/nn/runtime/test/generated/models/conv_quant8_overflow.model.cpp
+++ b/nn/runtime/test/generated/models/conv_quant8_overflow.model.cpp
@@ -22,7 +22,7 @@
   model->setOperandValue(stride, stride_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depth_to_space_float_1.model.cpp b/nn/runtime/test/generated/models/depth_to_space_float_1.model.cpp
index 800d130..12a8b69 100644
--- a/nn/runtime/test/generated/models/depth_to_space_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/depth_to_space_float_1.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTH_TO_SPACE, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depth_to_space_float_2.model.cpp b/nn/runtime/test/generated/models/depth_to_space_float_2.model.cpp
index edba9f5..80e27f5 100644
--- a/nn/runtime/test/generated/models/depth_to_space_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/depth_to_space_float_2.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTH_TO_SPACE, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depth_to_space_quant8_1.model.cpp b/nn/runtime/test/generated/models/depth_to_space_quant8_1.model.cpp
index fe2b0fb..791cb75 100644
--- a/nn/runtime/test/generated/models/depth_to_space_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/depth_to_space_quant8_1.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTH_TO_SPACE, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depth_to_space_quant8_2.model.cpp b/nn/runtime/test/generated/models/depth_to_space_quant8_2.model.cpp
index a37459a..f855432 100644
--- a/nn/runtime/test/generated/models/depth_to_space_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/depth_to_space_quant8_2.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTH_TO_SPACE, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv.model.cpp b/nn/runtime/test/generated/models/depthwise_conv.model.cpp
index 1807efa..8f28b53 100644
--- a/nn/runtime/test/generated/models/depthwise_conv.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv.model.cpp
@@ -30,7 +30,7 @@
   model->setOperandValue(op1, op1_init, sizeof(float) * 3);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op2, op0, op1, pad0, pad0, pad0, pad0, b5, b6, b7, b8}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv2d_float.model.cpp b/nn/runtime/test/generated/models/depthwise_conv2d_float.model.cpp
index 3c6bb8c..bfcabcd 100644
--- a/nn/runtime/test/generated/models/depthwise_conv2d_float.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv2d_float.model.cpp
@@ -23,7 +23,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv2d_float_large.model.cpp b/nn/runtime/test/generated/models/depthwise_conv2d_float_large.model.cpp
index 120856f..9a9852a 100644
--- a/nn/runtime/test/generated/models/depthwise_conv2d_float_large.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv2d_float_large.model.cpp
@@ -24,7 +24,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv2d_float_large_2.model.cpp b/nn/runtime/test/generated/models/depthwise_conv2d_float_large_2.model.cpp
index 2684dd2..740f500 100644
--- a/nn/runtime/test/generated/models/depthwise_conv2d_float_large_2.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv2d_float_large_2.model.cpp
@@ -24,7 +24,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv2d_quant8.model.cpp b/nn/runtime/test/generated/models/depthwise_conv2d_quant8.model.cpp
index e3f030a..7f2b4fc 100644
--- a/nn/runtime/test/generated/models/depthwise_conv2d_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv2d_quant8.model.cpp
@@ -24,7 +24,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv2d_quant8_large.model.cpp b/nn/runtime/test/generated/models/depthwise_conv2d_quant8_large.model.cpp
index 7fdd6e9..4060e4c 100644
--- a/nn/runtime/test/generated/models/depthwise_conv2d_quant8_large.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv2d_quant8_large.model.cpp
@@ -24,7 +24,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv_2d.model.cpp b/nn/runtime/test/generated/models/depthwise_conv_2d.model.cpp
index 6be0742..1514781 100644
--- a/nn/runtime/test/generated/models/depthwise_conv_2d.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv_2d.model.cpp
@@ -23,7 +23,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/depthwise_conv_2d_quant8.model.cpp b/nn/runtime/test/generated/models/depthwise_conv_2d_quant8.model.cpp
index 4aa76cf..3a21c4d 100644
--- a/nn/runtime/test/generated/models/depthwise_conv_2d_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/depthwise_conv_2d_quant8.model.cpp
@@ -24,7 +24,7 @@
   model->setOperandValue(channelMultiplier, channelMultiplier_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_DEPTHWISE_CONV_2D, {op1, op2, op3, pad0, pad0, pad0, pad0, stride, stride, channelMultiplier, act}, {op4});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, op3},
     {op4});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/dequantize.model.cpp b/nn/runtime/test/generated/models/dequantize.model.cpp
index f0194b1..2488307 100644
--- a/nn/runtime/test/generated/models/dequantize.model.cpp
+++ b/nn/runtime/test/generated/models/dequantize.model.cpp
@@ -8,7 +8,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_DEQUANTIZE, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/embedding_lookup.model.cpp b/nn/runtime/test/generated/models/embedding_lookup.model.cpp
index b253d22..e59f4de 100644
--- a/nn/runtime/test/generated/models/embedding_lookup.model.cpp
+++ b/nn/runtime/test/generated/models/embedding_lookup.model.cpp
@@ -9,7 +9,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_EMBEDDING_LOOKUP, {value, index}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {value, index},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/floor.model.cpp b/nn/runtime/test/generated/models/floor.model.cpp
index f1175f0..2425f47 100644
--- a/nn/runtime/test/generated/models/floor.model.cpp
+++ b/nn/runtime/test/generated/models/floor.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_FLOOR, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/fully_connected_float.model.cpp b/nn/runtime/test/generated/models/fully_connected_float.model.cpp
index cb67595..bae1fcd 100644
--- a/nn/runtime/test/generated/models/fully_connected_float.model.cpp
+++ b/nn/runtime/test/generated/models/fully_connected_float.model.cpp
@@ -15,7 +15,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_FULLY_CONNECTED, {op1, op2, b0, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, b0},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/fully_connected_float_large.model.cpp b/nn/runtime/test/generated/models/fully_connected_float_large.model.cpp
index 38c5c71..ab0ff4f 100644
--- a/nn/runtime/test/generated/models/fully_connected_float_large.model.cpp
+++ b/nn/runtime/test/generated/models/fully_connected_float_large.model.cpp
@@ -15,7 +15,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_FULLY_CONNECTED, {op1, op2, b0, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, b0},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/fully_connected_quant8.model.cpp b/nn/runtime/test/generated/models/fully_connected_quant8.model.cpp
index 6f995c1..6311c1b 100644
--- a/nn/runtime/test/generated/models/fully_connected_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/fully_connected_quant8.model.cpp
@@ -16,7 +16,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_FULLY_CONNECTED, {op1, op2, b0, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, b0},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/fully_connected_quant8_large.model.cpp b/nn/runtime/test/generated/models/fully_connected_quant8_large.model.cpp
index f54357d..ec18a16 100644
--- a/nn/runtime/test/generated/models/fully_connected_quant8_large.model.cpp
+++ b/nn/runtime/test/generated/models/fully_connected_quant8_large.model.cpp
@@ -15,7 +15,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_FULLY_CONNECTED, {op1, op2, b0, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2, b0},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/hashtable_lookup_float.model.cpp b/nn/runtime/test/generated/models/hashtable_lookup_float.model.cpp
index 0d31c0a..8c5970d 100644
--- a/nn/runtime/test/generated/models/hashtable_lookup_float.model.cpp
+++ b/nn/runtime/test/generated/models/hashtable_lookup_float.model.cpp
@@ -14,7 +14,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_HASHTABLE_LOOKUP, {lookup, key, value}, {output, hits});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {lookup, key, value},
     {output, hits});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/hashtable_lookup_quant8.model.cpp b/nn/runtime/test/generated/models/hashtable_lookup_quant8.model.cpp
index 5c6c418..043f2d3 100644
--- a/nn/runtime/test/generated/models/hashtable_lookup_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/hashtable_lookup_quant8.model.cpp
@@ -14,7 +14,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_HASHTABLE_LOOKUP, {lookup, key, value}, {output, hits});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {lookup, key, value},
     {output, hits});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/l2_normalization.model.cpp b/nn/runtime/test/generated/models/l2_normalization.model.cpp
index 1256609..a207ba4 100644
--- a/nn/runtime/test/generated/models/l2_normalization.model.cpp
+++ b/nn/runtime/test/generated/models/l2_normalization.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_L2_NORMALIZATION, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/l2_normalization_large.model.cpp b/nn/runtime/test/generated/models/l2_normalization_large.model.cpp
new file mode 100644
index 0000000..cadfa7b
--- /dev/null
+++ b/nn/runtime/test/generated/models/l2_normalization_large.model.cpp
@@ -0,0 +1,19 @@
+// Generated file (from: l2_normalization_large.mod.py). Do not edit
+void CreateModel(Model *model) {
+  OperandType type0(Type::TENSOR_FLOAT32, {1, 2, 2, 3});
+  // Phase 1, operands
+  auto op1 = model->addOperand(&type0);
+  auto op2 = model->addOperand(&type0);
+  // Phase 2, operations
+  model->addOperation(ANEURALNETWORKS_L2_NORMALIZATION, {op1}, {op2});
+  // Phase 3, inputs and outputs
+  model->identifyInputsAndOutputs(
+    {op1},
+    {op2});
+  assert(model->isValid());
+}
+
+bool is_ignored(int i) {
+  static std::set<int> ignore = {};
+  return ignore.find(i) != ignore.end();
+}
diff --git a/nn/runtime/test/generated/models/l2_pool_float.model.cpp b/nn/runtime/test/generated/models/l2_pool_float.model.cpp
index dbac514..d3a7bf3 100644
--- a/nn/runtime/test/generated/models/l2_pool_float.model.cpp
+++ b/nn/runtime/test/generated/models/l2_pool_float.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_L2_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/l2_pool_float_large.model.cpp b/nn/runtime/test/generated/models/l2_pool_float_large.model.cpp
new file mode 100644
index 0000000..9c3c562
--- /dev/null
+++ b/nn/runtime/test/generated/models/l2_pool_float_large.model.cpp
@@ -0,0 +1,39 @@
+// Generated file (from: l2_pool_float_large.mod.py). Do not edit
+void CreateModel(Model *model) {
+  OperandType type1(Type::INT32, {});
+  OperandType type2(Type::TENSOR_FLOAT32, {1, 1, 1, 3});
+  OperandType type0(Type::TENSOR_FLOAT32, {1, 2, 2, 3});
+  // Phase 1, operands
+  auto op1 = model->addOperand(&type0);
+  auto filter_width = model->addOperand(&type1);
+  auto filter_height = model->addOperand(&type1);
+  auto stride_width = model->addOperand(&type1);
+  auto stride_height = model->addOperand(&type1);
+  auto pad0 = model->addOperand(&type1);
+  auto act = model->addOperand(&type1);
+  auto op3 = model->addOperand(&type2);
+  // Phase 2, operations
+  static int32_t filter_width_init[] = {2};
+  model->setOperandValue(filter_width, filter_width_init, sizeof(int32_t) * 1);
+  static int32_t filter_height_init[] = {2};
+  model->setOperandValue(filter_height, filter_height_init, sizeof(int32_t) * 1);
+  static int32_t stride_width_init[] = {1};
+  model->setOperandValue(stride_width, stride_width_init, sizeof(int32_t) * 1);
+  static int32_t stride_height_init[] = {1};
+  model->setOperandValue(stride_height, stride_height_init, sizeof(int32_t) * 1);
+  static int32_t pad0_init[] = {0};
+  model->setOperandValue(pad0, pad0_init, sizeof(int32_t) * 1);
+  static int32_t act_init[] = {0};
+  model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
+  model->addOperation(ANEURALNETWORKS_L2_POOL_2D, {op1, pad0, pad0, pad0, pad0, stride_width, stride_height, filter_width, filter_height, act}, {op3});
+  // Phase 3, inputs and outputs
+  model->identifyInputsAndOutputs(
+    {op1},
+    {op3});
+  assert(model->isValid());
+}
+
+bool is_ignored(int i) {
+  static std::set<int> ignore = {};
+  return ignore.find(i) != ignore.end();
+}
diff --git a/nn/runtime/test/generated/models/local_response_norm_float_1.model.cpp b/nn/runtime/test/generated/models/local_response_norm_float_1.model.cpp
index 462884a..7543bbe 100644
--- a/nn/runtime/test/generated/models/local_response_norm_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/local_response_norm_float_1.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION, {input, radius, bias, alpha, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/local_response_norm_float_2.model.cpp b/nn/runtime/test/generated/models/local_response_norm_float_2.model.cpp
index fa5e133..5aae9a6 100644
--- a/nn/runtime/test/generated/models/local_response_norm_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/local_response_norm_float_2.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION, {input, radius, bias, alpha, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/local_response_norm_float_3.model.cpp b/nn/runtime/test/generated/models/local_response_norm_float_3.model.cpp
index b73099f..016da49 100644
--- a/nn/runtime/test/generated/models/local_response_norm_float_3.model.cpp
+++ b/nn/runtime/test/generated/models/local_response_norm_float_3.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION, {input, radius, bias, alpha, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/local_response_norm_float_4.model.cpp b/nn/runtime/test/generated/models/local_response_norm_float_4.model.cpp
index 4b1a109..8311f8f 100644
--- a/nn/runtime/test/generated/models/local_response_norm_float_4.model.cpp
+++ b/nn/runtime/test/generated/models/local_response_norm_float_4.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_LOCAL_RESPONSE_NORMALIZATION, {input, radius, bias, alpha, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/logistic_float_1.model.cpp b/nn/runtime/test/generated/models/logistic_float_1.model.cpp
index 8deff8e..2ca725f 100644
--- a/nn/runtime/test/generated/models/logistic_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/logistic_float_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LOGISTIC, {op1}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/logistic_float_2.model.cpp b/nn/runtime/test/generated/models/logistic_float_2.model.cpp
index 6208744..18d52cc 100644
--- a/nn/runtime/test/generated/models/logistic_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/logistic_float_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LOGISTIC, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/logistic_quant8_1.model.cpp b/nn/runtime/test/generated/models/logistic_quant8_1.model.cpp
index 8b21927..b0f97a9 100644
--- a/nn/runtime/test/generated/models/logistic_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/logistic_quant8_1.model.cpp
@@ -8,7 +8,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LOGISTIC, {op1}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/logistic_quant8_2.model.cpp b/nn/runtime/test/generated/models/logistic_quant8_2.model.cpp
index 87a1cad..b144183 100644
--- a/nn/runtime/test/generated/models/logistic_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/logistic_quant8_2.model.cpp
@@ -8,7 +8,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LOGISTIC, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/lsh_projection.model.cpp b/nn/runtime/test/generated/models/lsh_projection.model.cpp
index e446a8f..e445abd 100644
--- a/nn/runtime/test/generated/models/lsh_projection.model.cpp
+++ b/nn/runtime/test/generated/models/lsh_projection.model.cpp
@@ -14,7 +14,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LSH_PROJECTION, {hash, lookup, weight, type_param}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {hash, lookup, weight, type_param},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/lstm.model.cpp b/nn/runtime/test/generated/models/lstm.model.cpp
index 721d484..e5baa17 100644
--- a/nn/runtime/test/generated/models/lstm.model.cpp
+++ b/nn/runtime/test/generated/models/lstm.model.cpp
@@ -41,7 +41,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LSTM, {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param}, {output_state_out, cell_state_out, output, scratch_buffer});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param},
     {output_state_out, cell_state_out, output, scratch_buffer});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/lstm2.model.cpp b/nn/runtime/test/generated/models/lstm2.model.cpp
index 7580c11..14d7baf 100644
--- a/nn/runtime/test/generated/models/lstm2.model.cpp
+++ b/nn/runtime/test/generated/models/lstm2.model.cpp
@@ -41,7 +41,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LSTM, {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param}, {output_state_out, cell_state_out, output, scratch_buffer});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param},
     {output_state_out, cell_state_out, output, scratch_buffer});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/lstm3.model.cpp b/nn/runtime/test/generated/models/lstm3.model.cpp
index d87bce6..16f0662 100644
--- a/nn/runtime/test/generated/models/lstm3.model.cpp
+++ b/nn/runtime/test/generated/models/lstm3.model.cpp
@@ -42,7 +42,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_LSTM, {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param}, {output_state_out, cell_state_out, output, scratch_buffer});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input, input_to_input_weights, input_to_forget_weights, input_to_cell_weights, input_to_output_weights, recurrent_to_intput_weights, recurrent_to_forget_weights, recurrent_to_cell_weights, recurrent_to_output_weights, cell_to_input_weights, cell_to_forget_weights, cell_to_output_weights, input_gate_bias, forget_gate_bias, cell_gate_bias, output_gate_bias, projection_weights, projection_bias, output_state_in, cell_state_in, activation_param, cell_clip_param, proj_clip_param},
     {output_state_out, cell_state_out, output, scratch_buffer});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_float_1.model.cpp b/nn/runtime/test/generated/models/max_pool_float_1.model.cpp
index 32702b0..b37ce65 100644
--- a/nn/runtime/test/generated/models/max_pool_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_float_1.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_float_2.model.cpp b/nn/runtime/test/generated/models/max_pool_float_2.model.cpp
index 3142444..a0b89e1 100644
--- a/nn/runtime/test/generated/models/max_pool_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_float_2.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_float_3.model.cpp b/nn/runtime/test/generated/models/max_pool_float_3.model.cpp
index c43cdff..3d7e231 100644
--- a/nn/runtime/test/generated/models/max_pool_float_3.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_float_3.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(relu6_activation, relu6_activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, relu6_activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_quant8_1.model.cpp b/nn/runtime/test/generated/models/max_pool_quant8_1.model.cpp
index 0d6cb02..978dcbe 100644
--- a/nn/runtime/test/generated/models/max_pool_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_quant8_1.model.cpp
@@ -17,7 +17,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {op1, pad0, pad0, pad0, pad0, cons1, cons1, cons1, cons1, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_quant8_2.model.cpp b/nn/runtime/test/generated/models/max_pool_quant8_2.model.cpp
index 16ca21d..2ce9434 100644
--- a/nn/runtime/test/generated/models/max_pool_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_quant8_2.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(activation, activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/max_pool_quant8_3.model.cpp b/nn/runtime/test/generated/models/max_pool_quant8_3.model.cpp
index 8b99152..f8c3932 100644
--- a/nn/runtime/test/generated/models/max_pool_quant8_3.model.cpp
+++ b/nn/runtime/test/generated/models/max_pool_quant8_3.model.cpp
@@ -21,7 +21,7 @@
   model->setOperandValue(relu1_activation, relu1_activation_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MAX_POOL_2D, {i0, padding, padding, padding, padding, stride, stride, filter, filter, relu1_activation}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {i0},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mobilenet_224_gender_basic_fixed.model.cpp b/nn/runtime/test/generated/models/mobilenet_224_gender_basic_fixed.model.cpp
index 4d7192d..f6a50b3 100644
--- a/nn/runtime/test/generated/models/mobilenet_224_gender_basic_fixed.model.cpp
+++ b/nn/runtime/test/generated/models/mobilenet_224_gender_basic_fixed.model.cpp
@@ -665,7 +665,7 @@
   model->addOperation(ANEURALNETWORKS_CONV_2D, {op81, op84, op83, pad0, pad0, pad0, pad0, b215, b216, b217}, {op82});
   model->addOperation(ANEURALNETWORKS_LOGISTIC, {op82}, {op85});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op86},
     {op85});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mobilenet_quantized.model.cpp b/nn/runtime/test/generated/models/mobilenet_quantized.model.cpp
index d136def..0b65a17 100644
--- a/nn/runtime/test/generated/models/mobilenet_quantized.model.cpp
+++ b/nn/runtime/test/generated/models/mobilenet_quantized.model.cpp
@@ -707,7 +707,7 @@
   model->addOperation(ANEURALNETWORKS_RESHAPE, {op28, op86}, {op85});
   model->addOperation(ANEURALNETWORKS_SOFTMAX, {op85, b235}, {op87});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op88},
     {op87});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mul.model.cpp b/nn/runtime/test/generated/models/mul.model.cpp
index febb0db..9ab5c9a 100644
--- a/nn/runtime/test/generated/models/mul.model.cpp
+++ b/nn/runtime/test/generated/models/mul.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MUL, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mul_broadcast_quant8.model.cpp b/nn/runtime/test/generated/models/mul_broadcast_quant8.model.cpp
index 63a608f..06917ef 100644
--- a/nn/runtime/test/generated/models/mul_broadcast_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/mul_broadcast_quant8.model.cpp
@@ -14,7 +14,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MUL, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mul_quant8.model.cpp b/nn/runtime/test/generated/models/mul_quant8.model.cpp
index 9654064..5670845 100644
--- a/nn/runtime/test/generated/models/mul_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/mul_quant8.model.cpp
@@ -13,7 +13,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MUL, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/mul_relu.model.cpp b/nn/runtime/test/generated/models/mul_relu.model.cpp
index 07e8f45..ece7fd0 100644
--- a/nn/runtime/test/generated/models/mul_relu.model.cpp
+++ b/nn/runtime/test/generated/models/mul_relu.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(act, act_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_MUL, {op1, op2, act}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu1_float_1.model.cpp b/nn/runtime/test/generated/models/relu1_float_1.model.cpp
index 795ce5a..7bb424e 100644
--- a/nn/runtime/test/generated/models/relu1_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu1_float_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU1, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu1_float_2.model.cpp b/nn/runtime/test/generated/models/relu1_float_2.model.cpp
index 84f6664..cbf2e7d 100644
--- a/nn/runtime/test/generated/models/relu1_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu1_float_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU1, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu1_quant8_1.model.cpp b/nn/runtime/test/generated/models/relu1_quant8_1.model.cpp
index 2dff2be..905c87b 100644
--- a/nn/runtime/test/generated/models/relu1_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu1_quant8_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU1, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu1_quant8_2.model.cpp b/nn/runtime/test/generated/models/relu1_quant8_2.model.cpp
index 66d741f..8e58e33 100644
--- a/nn/runtime/test/generated/models/relu1_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu1_quant8_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU1, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu6_float_1.model.cpp b/nn/runtime/test/generated/models/relu6_float_1.model.cpp
index 50ec1ff..45c632b 100644
--- a/nn/runtime/test/generated/models/relu6_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu6_float_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU6, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu6_float_2.model.cpp b/nn/runtime/test/generated/models/relu6_float_2.model.cpp
index d407ac6..c59232b 100644
--- a/nn/runtime/test/generated/models/relu6_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu6_float_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU6, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu6_quant8_1.model.cpp b/nn/runtime/test/generated/models/relu6_quant8_1.model.cpp
index c6bc0c0..7be2b9a 100644
--- a/nn/runtime/test/generated/models/relu6_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu6_quant8_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU6, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu6_quant8_2.model.cpp b/nn/runtime/test/generated/models/relu6_quant8_2.model.cpp
index f5547e8..87b17cc 100644
--- a/nn/runtime/test/generated/models/relu6_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu6_quant8_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU6, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu_float_1.model.cpp b/nn/runtime/test/generated/models/relu_float_1.model.cpp
index 7988371..f2a2718 100644
--- a/nn/runtime/test/generated/models/relu_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu_float_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu_float_2.model.cpp b/nn/runtime/test/generated/models/relu_float_2.model.cpp
index cfc0ec1..13e8575 100644
--- a/nn/runtime/test/generated/models/relu_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu_float_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu_quant8_1.model.cpp b/nn/runtime/test/generated/models/relu_quant8_1.model.cpp
index 082032e..e5ebe01 100644
--- a/nn/runtime/test/generated/models/relu_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/relu_quant8_1.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/relu_quant8_2.model.cpp b/nn/runtime/test/generated/models/relu_quant8_2.model.cpp
index ec98464..fefba7a 100644
--- a/nn/runtime/test/generated/models/relu_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/relu_quant8_2.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RELU, {input}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/reshape.model.cpp b/nn/runtime/test/generated/models/reshape.model.cpp
index 0456658..ec856e2 100644
--- a/nn/runtime/test/generated/models/reshape.model.cpp
+++ b/nn/runtime/test/generated/models/reshape.model.cpp
@@ -10,7 +10,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RESHAPE, {op1, op2}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/reshape_quant8.model.cpp b/nn/runtime/test/generated/models/reshape_quant8.model.cpp
index 19f30cc..afaf5bb 100644
--- a/nn/runtime/test/generated/models/reshape_quant8.model.cpp
+++ b/nn/runtime/test/generated/models/reshape_quant8.model.cpp
@@ -10,7 +10,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RESHAPE, {op1, op2}, {op3});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1, op2},
     {op3});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/resize_bilinear.model.cpp b/nn/runtime/test/generated/models/resize_bilinear.model.cpp
index 4f7303b..97cf32c 100644
--- a/nn/runtime/test/generated/models/resize_bilinear.model.cpp
+++ b/nn/runtime/test/generated/models/resize_bilinear.model.cpp
@@ -15,7 +15,7 @@
   model->setOperandValue(height, height_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_RESIZE_BILINEAR, {op1, width, height}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/rnn.model.cpp b/nn/runtime/test/generated/models/rnn.model.cpp
index a5788c6..867efc1 100644
--- a/nn/runtime/test/generated/models/rnn.model.cpp
+++ b/nn/runtime/test/generated/models/rnn.model.cpp
@@ -18,7 +18,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_RNN, {input, weights, recurrent_weights, bias, hidden_state_in, activation_param}, {hidden_state_out, output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input, weights, recurrent_weights, bias, hidden_state_in, activation_param},
     {hidden_state_out, output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/softmax_float_1.model.cpp b/nn/runtime/test/generated/models/softmax_float_1.model.cpp
index a91b055..d189002 100644
--- a/nn/runtime/test/generated/models/softmax_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/softmax_float_1.model.cpp
@@ -11,7 +11,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_SOFTMAX, {input, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/softmax_float_2.model.cpp b/nn/runtime/test/generated/models/softmax_float_2.model.cpp
index 52c6ab4..8f575cf 100644
--- a/nn/runtime/test/generated/models/softmax_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/softmax_float_2.model.cpp
@@ -11,7 +11,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_SOFTMAX, {input, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/softmax_quant8_1.model.cpp b/nn/runtime/test/generated/models/softmax_quant8_1.model.cpp
index 15d7084..4e7eb8a 100644
--- a/nn/runtime/test/generated/models/softmax_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/softmax_quant8_1.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_SOFTMAX, {input, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/softmax_quant8_2.model.cpp b/nn/runtime/test/generated/models/softmax_quant8_2.model.cpp
index c818162..e24d6f2 100644
--- a/nn/runtime/test/generated/models/softmax_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/softmax_quant8_2.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(beta, beta_init, sizeof(float) * 1);
   model->addOperation(ANEURALNETWORKS_SOFTMAX, {input, beta}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/space_to_depth_float_1.model.cpp b/nn/runtime/test/generated/models/space_to_depth_float_1.model.cpp
index 203f439..95e6df9 100644
--- a/nn/runtime/test/generated/models/space_to_depth_float_1.model.cpp
+++ b/nn/runtime/test/generated/models/space_to_depth_float_1.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_SPACE_TO_DEPTH, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/space_to_depth_float_2.model.cpp b/nn/runtime/test/generated/models/space_to_depth_float_2.model.cpp
index 0b2154d..811efe7 100644
--- a/nn/runtime/test/generated/models/space_to_depth_float_2.model.cpp
+++ b/nn/runtime/test/generated/models/space_to_depth_float_2.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_SPACE_TO_DEPTH, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/space_to_depth_quant8_1.model.cpp b/nn/runtime/test/generated/models/space_to_depth_quant8_1.model.cpp
index fc3c8e0..8f0dbad 100644
--- a/nn/runtime/test/generated/models/space_to_depth_quant8_1.model.cpp
+++ b/nn/runtime/test/generated/models/space_to_depth_quant8_1.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_SPACE_TO_DEPTH, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/space_to_depth_quant8_2.model.cpp b/nn/runtime/test/generated/models/space_to_depth_quant8_2.model.cpp
index 060c611..7bd289d 100644
--- a/nn/runtime/test/generated/models/space_to_depth_quant8_2.model.cpp
+++ b/nn/runtime/test/generated/models/space_to_depth_quant8_2.model.cpp
@@ -12,7 +12,7 @@
   model->setOperandValue(radius, radius_init, sizeof(int32_t) * 1);
   model->addOperation(ANEURALNETWORKS_SPACE_TO_DEPTH, {input, radius}, {output});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input},
     {output});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/svdf.model.cpp b/nn/runtime/test/generated/models/svdf.model.cpp
index 074ec77..41533c2 100644
--- a/nn/runtime/test/generated/models/svdf.model.cpp
+++ b/nn/runtime/test/generated/models/svdf.model.cpp
@@ -20,7 +20,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_SVDF, {input, weights_feature, weights_time, bias, state_in, rank_param, activation_param}, {output, state_out});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {input, weights_feature, weights_time, bias, state_in, rank_param, activation_param},
     {output, state_out});
   assert(model->isValid());
diff --git a/nn/runtime/test/generated/models/tanh.model.cpp b/nn/runtime/test/generated/models/tanh.model.cpp
index 71a2af6..bc3cd4a 100644
--- a/nn/runtime/test/generated/models/tanh.model.cpp
+++ b/nn/runtime/test/generated/models/tanh.model.cpp
@@ -7,7 +7,7 @@
   // Phase 2, operations
   model->addOperation(ANEURALNETWORKS_TANH, {op1}, {op2});
   // Phase 3, inputs and outputs
-  model->setInputsAndOutputs(
+  model->identifyInputsAndOutputs(
     {op1},
     {op2});
   assert(model->isValid());