Rename and improve uplink draft
Routing: minor fixes