Simplify code related to container naming [GH-132]