renaming and cleaning up container and stream concepts