Removes hard-coded underscore from generated names

* Removes the hard coded underscore from rand_name as it can cause
  unintended and unavoidable problems (server hostnames in this case)

Change-Id: Id20e59fd4c1c76ca9f930b1b763d9a489ee7fe9c
Merge "Removes hard-coded underscore from generated names"