Rename container variables to data