Renaming streamName to streamId for consistencty
Consistency renaming around containers