Fixed container naming.