Improved variable naming, fixed possible crash
Merge branch 'routing' of https://github.com/kutagh/NetChange into routing