[REFACTOR] refs #35787 @0.15 Refactored variable names