Fix container names (with/of)

fixes #4954