We have changed the names of the container in another MR. This adapts the rest of the code to that change
@tbold