Make router_name and transport_name usable for the expansions