Concurrent:
 - cleanup and rename
 - code fixes for compat with Containers 0.7.0