Restore some of the original variable names, but fix the warnings their renaming addressed by removing the global variants instead.
Restore some of the original variable names, but fix the warnings their
renaming addressed by removing the global variants instead.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase