Cleanup and renaming
Stream format change
Small naming changes