Change Downstream, Upstream labels to Down, Up
Update tests for label changes