Fix unique names for containers #21