Implemented new stream name system