Cleanup references to AddressNetwork

[lowhung]

What:

• We still have some references to AddressNetwork that should be refactored to be NetworkId to unify this type.

AC:

• No more references to AddressNetwork