Merge pull request #10841 from latortuga/fix-underscore-dependency-tracking

Fix mismatching variable names when using an underscore