Rename Container to Collection. Fixes #64