Use uniform naming scheme for scope rc vars

Conflicts:
	proof/proof/src/TProofServ.cxx