refactor: consolidate inbound
and outbound
naming
#2118
Merged
inbound
and outbound
naming
#2118