Change crappy nonstandard name 'upstream' to nice standard name 'origin'