Modifications to variable names
Remerge
Merge remote-tracking branch 'origin/Sinbad' into Sinbad

Conflicts:
	sinbadBuild/SinbadVariables.cxx