nvda

Replace some internal deprecated usage with correct symbols

#18930

Merged