Containers are now template names.
Fix merge.