More Sreq cleanup

Changing the local variable names in the last few places to be consistent
Merge pull request #18724 from jacksontj/develop

More Sreq cleanup