Rename, add user streams