Rename container variables to data
Merge pull request #195 from tzz/master

Rename container variables to data