Rename broken containers