whitespace cleanup
change name of created containers