More Sreq cleanup

Changing the local variable names in the last few places to be consistent