Added scope block names and changed stream naming a bit