Replace Stream return type from tuple to Record and rename refactoring