Be consistent WRT function argument names. Other arguments only have types, so remove these names. This also helps by not polluting namespace.
Be consistent WRT function argument names. Other arguments only have
types, so remove these names. This also helps by not polluting
namespace.

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