rename and refactor stream to work for both nodes and ways