Replace / in Tensorflow constants and placeholders to _

5 files changed, 161 insertions, 158 deletions

diff --git a/config-model/src/test/integration/tensorflow/models/mnist_softmax/mnist_sftmax_with_saving.py b/config-model/src/test/integration/tensorflow/models/mnist_softmax/mnist_sftmax_with_saving.py
index a1861a1c981..5d67a267706 100644
--- a/config-model/src/test/integration/tensorflow/models/mnist_softmax/mnist_sftmax_with_saving.py
+++ b/config-model/src/test/integration/tensorflow/models/mnist_softmax/mnist_sftmax_with_saving.py
@@ -38,9 +38,12 @@ def main(_):
 
   # Create the model
   x = tf.placeholder(tf.float32, [None, 784])
-  W = tf.Variable(tf.zeros([784, 10]))
-  b = tf.Variable(tf.zeros([10]))
-  y = tf.matmul(x, W) + b
+
+  with tf.name_scope("layer"):
+    W = tf.Variable(tf.zeros([784, 10]))
+    b = tf.Variable(tf.zeros([10]))
+    y = tf.matmul(x, W) + b
+
 
   # Define loss and optimizer
   y_ = tf.placeholder(tf.float32, [None, 10])
diff --git a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/saved_model.pbtxt b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/saved_model.pbtxt
index 8100dfd594d..05b0e4e0f29 100644
--- a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/saved_model.pbtxt
+++ b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/saved_model.pbtxt
@@ -1146,7 +1146,7 @@ meta_graphs {
     }
     tags: "serve"
     tensorflow_version: "1.4.1"
-    tensorflow_git_version: "v1.4.0-19-ga52c8d9b01"
+    tensorflow_git_version: "v1.4.0-19-ga52c8d9"
   }
   graph_def {
     node {
@@ -1188,7 +1188,45 @@ meta_graphs {
       }
     }
     node {
-      name: "zeros"
+      name: "Placeholder_1"
+      op: "Placeholder"
+      attr {
+        key: "_output_shapes"
+        value {
+          list {
+            shape {
+              dim {
+                size: -1
+              }
+              dim {
+                size: 10
+              }
+            }
+          }
+        }
+      }
+      attr {
+        key: "dtype"
+        value {
+          type: DT_FLOAT
+        }
+      }
+      attr {
+        key: "shape"
+        value {
+          shape {
+            dim {
+              size: -1
+            }
+            dim {
+              size: 10
+            }
+          }
+        }
+      }
+    }
+    node {
+      name: "layer/zeros"
       op: "Const"
       attr {
         key: "_output_shapes"
@@ -1230,7 +1268,7 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable"
+      name: "layer/Variable"
       op: "VariableV2"
       attr {
         key: "_output_shapes"
@@ -1280,10 +1318,10 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable/Assign"
+      name: "layer/Variable/Assign"
       op: "Assign"
-      input: "Variable"
-      input: "zeros"
+      input: "layer/Variable"
+      input: "layer/zeros"
       attr {
         key: "T"
         value {
@@ -1294,7 +1332,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable"
+            s: "loc:@layer/Variable"
           }
         }
       }
@@ -1327,9 +1365,9 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable/read"
+      name: "layer/Variable/read"
       op: "Identity"
-      input: "Variable"
+      input: "layer/Variable"
       attr {
         key: "T"
         value {
@@ -1340,7 +1378,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable"
+            s: "loc:@layer/Variable"
           }
         }
       }
@@ -1361,7 +1399,7 @@ meta_graphs {
       }
     }
     node {
-      name: "zeros_1"
+      name: "layer/zeros_1"
       op: "Const"
       attr {
         key: "_output_shapes"
@@ -1397,7 +1435,7 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable_1"
+      name: "layer/Variable_1"
       op: "VariableV2"
       attr {
         key: "_output_shapes"
@@ -1441,10 +1479,10 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable_1/Assign"
+      name: "layer/Variable_1/Assign"
       op: "Assign"
-      input: "Variable_1"
-      input: "zeros_1"
+      input: "layer/Variable_1"
+      input: "layer/zeros_1"
       attr {
         key: "T"
         value {
@@ -1455,7 +1493,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable_1"
+            s: "loc:@layer/Variable_1"
           }
         }
       }
@@ -1485,9 +1523,9 @@ meta_graphs {
       }
     }
     node {
-      name: "Variable_1/read"
+      name: "layer/Variable_1/read"
       op: "Identity"
-      input: "Variable_1"
+      input: "layer/Variable_1"
       attr {
         key: "T"
         value {
@@ -1498,7 +1536,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable_1"
+            s: "loc:@layer/Variable_1"
           }
         }
       }
@@ -1516,10 +1554,10 @@ meta_graphs {
       }
     }
     node {
-      name: "MatMul"
+      name: "layer/MatMul"
       op: "MatMul"
       input: "Placeholder"
-      input: "Variable/read"
+      input: "layer/Variable/read"
       attr {
         key: "T"
         value {
@@ -1555,10 +1593,10 @@ meta_graphs {
       }
     }
     node {
-      name: "add"
+      name: "layer/add"
       op: "Add"
-      input: "MatMul"
-      input: "Variable_1/read"
+      input: "layer/MatMul"
+      input: "layer/Variable_1/read"
       attr {
         key: "T"
         value {
@@ -1582,44 +1620,6 @@ meta_graphs {
       }
     }
     node {
-      name: "Placeholder_1"
-      op: "Placeholder"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 10
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-            dim {
-              size: -1
-            }
-            dim {
-              size: 10
-            }
-          }
-        }
-      }
-    }
-    node {
       name: "Rank"
       op: "Const"
       attr {
@@ -1652,7 +1652,7 @@ meta_graphs {
     node {
       name: "Shape"
       op: "Shape"
-      input: "add"
+      input: "layer/add"
       attr {
         key: "T"
         value {
@@ -1711,7 +1711,7 @@ meta_graphs {
     node {
       name: "Shape_1"
       op: "Shape"
-      input: "add"
+      input: "layer/add"
       attr {
         key: "T"
         value {
@@ -1996,7 +1996,7 @@ meta_graphs {
     node {
       name: "Reshape"
       op: "Reshape"
-      input: "add"
+      input: "layer/add"
       input: "concat"
       attr {
         key: "T"
@@ -3423,7 +3423,7 @@ meta_graphs {
     node {
       name: "gradients/Reshape_grad/Shape"
       op: "Shape"
-      input: "add"
+      input: "layer/add"
       attr {
         key: "T"
         value {
@@ -3483,9 +3483,9 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Shape"
+      name: "gradients/layer/add_grad/Shape"
       op: "Shape"
-      input: "MatMul"
+      input: "layer/MatMul"
       attr {
         key: "T"
         value {
@@ -3512,7 +3512,7 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Shape_1"
+      name: "gradients/layer/add_grad/Shape_1"
       op: "Const"
       attr {
         key: "_output_shapes"
@@ -3548,10 +3548,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/BroadcastGradientArgs"
+      name: "gradients/layer/add_grad/BroadcastGradientArgs"
       op: "BroadcastGradientArgs"
-      input: "gradients/add_grad/Shape"
-      input: "gradients/add_grad/Shape_1"
+      input: "gradients/layer/add_grad/Shape"
+      input: "gradients/layer/add_grad/Shape_1"
       attr {
         key: "T"
         value {
@@ -3577,10 +3577,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Sum"
+      name: "gradients/layer/add_grad/Sum"
       op: "Sum"
       input: "gradients/Reshape_grad/Reshape"
-      input: "gradients/add_grad/BroadcastGradientArgs"
+      input: "gradients/layer/add_grad/BroadcastGradientArgs"
       attr {
         key: "T"
         value {
@@ -3611,10 +3611,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Reshape"
+      name: "gradients/layer/add_grad/Reshape"
       op: "Reshape"
-      input: "gradients/add_grad/Sum"
-      input: "gradients/add_grad/Shape"
+      input: "gradients/layer/add_grad/Sum"
+      input: "gradients/layer/add_grad/Shape"
       attr {
         key: "T"
         value {
@@ -3644,10 +3644,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Sum_1"
+      name: "gradients/layer/add_grad/Sum_1"
       op: "Sum"
       input: "gradients/Reshape_grad/Reshape"
-      input: "gradients/add_grad/BroadcastGradientArgs:1"
+      input: "gradients/layer/add_grad/BroadcastGradientArgs:1"
       attr {
         key: "T"
         value {
@@ -3678,10 +3678,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/Reshape_1"
+      name: "gradients/layer/add_grad/Reshape_1"
       op: "Reshape"
-      input: "gradients/add_grad/Sum_1"
-      input: "gradients/add_grad/Shape_1"
+      input: "gradients/layer/add_grad/Sum_1"
+      input: "gradients/layer/add_grad/Shape_1"
       attr {
         key: "T"
         value {
@@ -3708,16 +3708,16 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/tuple/group_deps"
+      name: "gradients/layer/add_grad/tuple/group_deps"
       op: "NoOp"
-      input: "^gradients/add_grad/Reshape"
-      input: "^gradients/add_grad/Reshape_1"
+      input: "^gradients/layer/add_grad/Reshape"
+      input: "^gradients/layer/add_grad/Reshape_1"
     }
     node {
-      name: "gradients/add_grad/tuple/control_dependency"
+      name: "gradients/layer/add_grad/tuple/control_dependency"
       op: "Identity"
-      input: "gradients/add_grad/Reshape"
-      input: "^gradients/add_grad/tuple/group_deps"
+      input: "gradients/layer/add_grad/Reshape"
+      input: "^gradients/layer/add_grad/tuple/group_deps"
       attr {
         key: "T"
         value {
@@ -3728,7 +3728,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@gradients/add_grad/Reshape"
+            s: "loc:@gradients/layer/add_grad/Reshape"
           }
         }
       }
@@ -3749,10 +3749,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/add_grad/tuple/control_dependency_1"
+      name: "gradients/layer/add_grad/tuple/control_dependency_1"
       op: "Identity"
-      input: "gradients/add_grad/Reshape_1"
-      input: "^gradients/add_grad/tuple/group_deps"
+      input: "gradients/layer/add_grad/Reshape_1"
+      input: "^gradients/layer/add_grad/tuple/group_deps"
       attr {
         key: "T"
         value {
@@ -3763,7 +3763,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@gradients/add_grad/Reshape_1"
+            s: "loc:@gradients/layer/add_grad/Reshape_1"
           }
         }
       }
@@ -3781,10 +3781,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/MatMul_grad/MatMul"
+      name: "gradients/layer/MatMul_grad/MatMul"
       op: "MatMul"
-      input: "gradients/add_grad/tuple/control_dependency"
-      input: "Variable/read"
+      input: "gradients/layer/add_grad/tuple/control_dependency"
+      input: "layer/Variable/read"
       attr {
         key: "T"
         value {
@@ -3820,10 +3820,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/MatMul_grad/MatMul_1"
+      name: "gradients/layer/MatMul_grad/MatMul_1"
       op: "MatMul"
       input: "Placeholder"
-      input: "gradients/add_grad/tuple/control_dependency"
+      input: "gradients/layer/add_grad/tuple/control_dependency"
       attr {
         key: "T"
         value {
@@ -3859,16 +3859,16 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/MatMul_grad/tuple/group_deps"
+      name: "gradients/layer/MatMul_grad/tuple/group_deps"
       op: "NoOp"
-      input: "^gradients/MatMul_grad/MatMul"
-      input: "^gradients/MatMul_grad/MatMul_1"
+      input: "^gradients/layer/MatMul_grad/MatMul"
+      input: "^gradients/layer/MatMul_grad/MatMul_1"
     }
     node {
-      name: "gradients/MatMul_grad/tuple/control_dependency"
+      name: "gradients/layer/MatMul_grad/tuple/control_dependency"
       op: "Identity"
-      input: "gradients/MatMul_grad/MatMul"
-      input: "^gradients/MatMul_grad/tuple/group_deps"
+      input: "gradients/layer/MatMul_grad/MatMul"
+      input: "^gradients/layer/MatMul_grad/tuple/group_deps"
       attr {
         key: "T"
         value {
@@ -3879,7 +3879,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@gradients/MatMul_grad/MatMul"
+            s: "loc:@gradients/layer/MatMul_grad/MatMul"
           }
         }
       }
@@ -3900,10 +3900,10 @@ meta_graphs {
       }
     }
     node {
-      name: "gradients/MatMul_grad/tuple/control_dependency_1"
+      name: "gradients/layer/MatMul_grad/tuple/control_dependency_1"
       op: "Identity"
-      input: "gradients/MatMul_grad/MatMul_1"
-      input: "^gradients/MatMul_grad/tuple/group_deps"
+      input: "gradients/layer/MatMul_grad/MatMul_1"
+      input: "^gradients/layer/MatMul_grad/tuple/group_deps"
       attr {
         key: "T"
         value {
@@ -3914,7 +3914,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@gradients/MatMul_grad/MatMul_1"
+            s: "loc:@gradients/layer/MatMul_grad/MatMul_1"
           }
         }
       }
@@ -3965,11 +3965,11 @@ meta_graphs {
       }
     }
     node {
-      name: "GradientDescent/update_Variable/ApplyGradientDescent"
+      name: "GradientDescent/update_layer/Variable/ApplyGradientDescent"
       op: "ApplyGradientDescent"
-      input: "Variable"
+      input: "layer/Variable"
       input: "GradientDescent/learning_rate"
-      input: "gradients/MatMul_grad/tuple/control_dependency_1"
+      input: "gradients/layer/MatMul_grad/tuple/control_dependency_1"
       attr {
         key: "T"
         value {
@@ -3980,7 +3980,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable"
+            s: "loc:@layer/Variable"
           }
         }
       }
@@ -4007,11 +4007,11 @@ meta_graphs {
       }
     }
     node {
-      name: "GradientDescent/update_Variable_1/ApplyGradientDescent"
+      name: "GradientDescent/update_layer/Variable_1/ApplyGradientDescent"
       op: "ApplyGradientDescent"
-      input: "Variable_1"
+      input: "layer/Variable_1"
       input: "GradientDescent/learning_rate"
-      input: "gradients/add_grad/tuple/control_dependency_1"
+      input: "gradients/layer/add_grad/tuple/control_dependency_1"
       attr {
         key: "T"
         value {
@@ -4022,7 +4022,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable_1"
+            s: "loc:@layer/Variable_1"
           }
         }
       }
@@ -4048,14 +4048,14 @@ meta_graphs {
     node {
       name: "GradientDescent"
       op: "NoOp"
-      input: "^GradientDescent/update_Variable/ApplyGradientDescent"
-      input: "^GradientDescent/update_Variable_1/ApplyGradientDescent"
+      input: "^GradientDescent/update_layer/Variable/ApplyGradientDescent"
+      input: "^GradientDescent/update_layer/Variable_1/ApplyGradientDescent"
     }
     node {
       name: "init"
       op: "NoOp"
-      input: "^Variable/Assign"
-      input: "^Variable_1/Assign"
+      input: "^layer/Variable/Assign"
+      input: "^layer/Variable_1/Assign"
     }
     node {
       name: "ArgMax/dimension"
@@ -4090,7 +4090,7 @@ meta_graphs {
     node {
       name: "ArgMax"
       op: "ArgMax"
-      input: "add"
+      input: "layer/add"
       input: "ArgMax/dimension"
       attr {
         key: "T"
@@ -4366,7 +4366,7 @@ meta_graphs {
             dtype: DT_STRING
             tensor_shape {
             }
-            string_val: "_temp_6ca9fa5171ed4237a2fbcc27277e2864/part"
+            string_val: "_temp_65caff16d5244276b9828b0dab21b157/part"
           }
         }
       }
@@ -4505,8 +4505,8 @@ meta_graphs {
                 size: 2
               }
             }
-            string_val: "Variable"
-            string_val: "Variable_1"
+            string_val: "layer/Variable"
+            string_val: "layer/Variable_1"
           }
         }
       }
@@ -4554,8 +4554,8 @@ meta_graphs {
       input: "save/ShardedFilename"
       input: "save/SaveV2/tensor_names"
       input: "save/SaveV2/shape_and_slices"
-      input: "Variable"
-      input: "Variable_1"
+      input: "layer/Variable"
+      input: "layer/Variable_1"
       attr {
         key: "dtypes"
         value {
@@ -4696,7 +4696,7 @@ meta_graphs {
                 size: 1
               }
             }
-            string_val: "Variable"
+            string_val: "layer/Variable"
           }
         }
       }
@@ -4765,7 +4765,7 @@ meta_graphs {
     node {
       name: "save/Assign"
       op: "Assign"
-      input: "Variable"
+      input: "layer/Variable"
       input: "save/RestoreV2"
       attr {
         key: "T"
@@ -4777,7 +4777,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable"
+            s: "loc:@layer/Variable"
           }
         }
       }
@@ -4840,7 +4840,7 @@ meta_graphs {
                 size: 1
               }
             }
-            string_val: "Variable_1"
+            string_val: "layer/Variable_1"
           }
         }
       }
@@ -4909,7 +4909,7 @@ meta_graphs {
     node {
       name: "save/Assign_1"
       op: "Assign"
-      input: "Variable_1"
+      input: "layer/Variable_1"
       input: "save/RestoreV2_1"
       attr {
         key: "T"
@@ -4921,7 +4921,7 @@ meta_graphs {
         key: "_class"
         value {
           list {
-            s: "loc:@Variable_1"
+            s: "loc:@layer/Variable_1"
           }
         }
       }
@@ -4986,8 +4986,8 @@ meta_graphs {
     key: "trainable_variables"
     value {
       bytes_list {
-        value: "\n\nVariable:0\022\017Variable/Assign\032\017Variable/read:02\007zeros:0"
-        value: "\n\014Variable_1:0\022\021Variable_1/Assign\032\021Variable_1/read:02\tzeros_1:0"
+        value: "\n\020layer/Variable:0\022\025layer/Variable/Assign\032\025layer/Variable/read:02\rlayer/zeros:0"
+        value: "\n\022layer/Variable_1:0\022\027layer/Variable_1/Assign\032\027layer/Variable_1/read:02\017layer/zeros_1:0"
       }
     }
   }
@@ -4995,8 +4995,8 @@ meta_graphs {
     key: "variables"
     value {
       bytes_list {
-        value: "\n\nVariable:0\022\017Variable/Assign\032\017Variable/read:02\007zeros:0"
-        value: "\n\014Variable_1:0\022\021Variable_1/Assign\032\021Variable_1/read:02\tzeros_1:0"
+        value: "\n\020layer/Variable:0\022\025layer/Variable/Assign\032\025layer/Variable/read:02\rlayer/zeros:0"
+        value: "\n\022layer/Variable_1:0\022\027layer/Variable_1/Assign\032\027layer/Variable_1/read:02\017layer/zeros_1:0"
       }
     }
   }
@@ -5021,7 +5021,7 @@ meta_graphs {
       outputs {
         key: "y"
         value {
-          name: "add:0"
+          name: "layer/add:0"
           dtype: DT_FLOAT
           tensor_shape {
             dim {
diff --git a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.data-00000-of-00001 b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.data-00000-of-00001
index 8474aa0a04c..826b0280abf 100644
--- a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.data-00000-of-00001
+++ b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.data-00000-of-00001
diff --git a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.index b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.index
index cfcdac20409..d00fc5b06ed 100644
--- a/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.index
+++ b/config-model/src/test/integration/tensorflow/models/mnist_softmax/saved/variables/variables.index
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
index c077ce01289..e6db6abdc95 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorFlowTestCase.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.fail;
 public class RankingExpressionWithTensorFlowTestCase {
 
     private final Path applicationDir = Path.fromString("src/test/integration/tensorflow/");
-    private final String vespaExpression = "join(rename(reduce(join(Placeholder, rename(constant(\"Variable\"), (d0, d1), (d1, d3)), f(a,b)(a * b)), sum, d1), d3, d1), rename(constant(\"Variable_1\"), d0, d1), f(a,b)(a + b))";
+    private final String vespaExpression = "join(rename(reduce(join(Placeholder, rename(constant(\"layer_Variable\"), (d0, d1), (d1, d3)), f(a,b)(a * b)), sum, d1), d3, d1), rename(constant(\"layer_Variable_1\"), d0, d1), f(a,b)(a + b))";
 
     @After
     public void removeGeneratedConstantTensorFiles() {
@@ -54,8 +54,8 @@ public class RankingExpressionWithTensorFlowTestCase {
         RankProfileSearchFixture search = fixtureWith("tensor(d0[2],d1[784])(0.0)",
                                                       "tensorflow('mnist_softmax/saved')");
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -65,8 +65,8 @@ public class RankingExpressionWithTensorFlowTestCase {
                                                       "constant mytensor { file: ignored\ntype: tensor(d0[7],d1[784]) }",
                                                       null);
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -84,8 +84,8 @@ public class RankingExpressionWithTensorFlowTestCase {
                                                       null,
                                                       application);
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -97,8 +97,8 @@ public class RankingExpressionWithTensorFlowTestCase {
                                                       "field mytensor type tensor(d0[],d1[784]) { indexing: attribute }",
                                                       application);
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -116,8 +116,8 @@ public class RankingExpressionWithTensorFlowTestCase {
                                                       "field mytensor type tensor(d0[],d1[784]) { indexing: attribute }",
                                                       application);
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -125,8 +125,8 @@ public class RankingExpressionWithTensorFlowTestCase {
         RankProfileSearchFixture search = fixtureWith("tensor(d0[2],d1[784])(0.0)",
                                                       "5 + sum(tensorflow('mnist_softmax/saved'))");
         search.assertFirstPhaseExpression("5 + reduce(" + vespaExpression + ", sum)", "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
     }
 
     @Test
@@ -219,8 +219,8 @@ public class RankingExpressionWithTensorFlowTestCase {
         RankProfileSearchFixture search = fixtureWith("tensor(d0[2],d1[784])(0.0)",
                                                       "tensorflow('mnist_softmax/saved')");
         search.assertFirstPhaseExpression(vespaExpression, "my_profile");
-        assertConstant("Variable_1", search, Optional.of(10L));
-        assertConstant("Variable", search, Optional.of(7840L));
+        assertConstant("layer_Variable_1", search, Optional.of(10L));
+        assertConstant("layer_Variable", search, Optional.of(7840L));
 
         // At this point the expression is stored - copy application to another location which do not have a models dir
         Path storedApplicationDirectory = applicationDir.getParentPath().append("copy");
@@ -237,8 +237,8 @@ public class RankingExpressionWithTensorFlowTestCase {
             searchFromStored.assertFirstPhaseExpression(vespaExpression, "my_profile");
             // Verify that the constants exists, but don't verify the content as we are not
             // simulating file distribution in this test
-            assertConstant("Variable_1", searchFromStored, Optional.empty());
-            assertConstant("Variable", searchFromStored, Optional.empty());
+            assertConstant("layer_Variable_1", searchFromStored, Optional.empty());
+            assertConstant("layer_Variable", searchFromStored, Optional.empty());
         }
         finally {
             IOUtils.recursiveDeleteDir(storedApplicationDirectory.toFile());