Rename and expose message-specific `NextHop`