Add some Async.waits to container naming for now

FIXME