This is a temporary patch to help us figure out what is causing the random
issues on concurrent builds and re-using an instance.

This patch also makes the log names concise and consistent across all versions.
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>