Var and method name improvements after code review

[#75859500]