Refactoring: test stream names renaming