The source project of this merge request has been removed.
WIP: Fix the ambiguity b/w router and network names.
The external public network and the router (attached to the DMZnet and the bright-external-net) both use the same name "borderrouter", under different block definitions. The changes made will improve the readability of the code.