Revert "Use native model names"

This reverts commit f0b8371b34577db9ad6d932e637c630488c6ecbc.

Change-Id: I4e666e862593219f6bd44d3cc9c87315a7980cd6
diff --git a/tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-ocata-dvr.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-ocata-dvr.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-dvr.yaml
diff --git a/tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-ocata-ovs.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-ocata-ovs.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-ocata-ovs.yaml
diff --git a/tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-pike-dvr.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-pike-dvr.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-dvr.yaml
diff --git a/tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-pike-ovs.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-model-generator/salt_virtual-mcp-pike-ovs.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-pike-ovs.yaml