Revert "Revert "[VOL-3008] Using consistent names in BBSim releases""

This reverts commit 490b14086c1b6ee4b80a899fedfbb6835f49aff4.

Change-Id: I81e0f1c30d1b75027b832ebf2430bb7cfdebebd0
diff --git a/.gitignore b/.gitignore
index 124a8d3..a767f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 *.xml
 *.pyc
 *.swp
+
+# IDEs
+.idea
\ No newline at end of file
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 836e484..7e17808 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim
+    ip: bbsim0
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 018aa78..a2dff34 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -29,7 +29,7 @@
 
 olts:
   -
-    ip: bbsim
+    ip: bbsim0
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index baddfc9..4b6810a 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim
+    ip: bbsim0
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index 1e9b2fe..a1f5ace 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -30,7 +30,7 @@
 
 olts:
   -
-    ip: bbsim
+    ip: bbsim0
     serial: BBSIM_OLT_0
 
 hosts:
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index a65d0fb..f0f948c 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -29,7 +29,7 @@
 
 olts:
   -
-    ip: bbsim
+    ip: bbsim0
     serial: BBSIM_OLT_0
 
 hosts: