Net package constants fix

Rebased version

This PR fixes up all the global constants that are defined at the top of the file for the NET\* classes. I have not touched any global variables that are defined from inside the class, as that is a more in depth update that will be a separate PR.