Accommodate network/network-uri split
Merge pull request #2053 from RyanGlScott/master

Accommodate network/network-uri split