Update Python samples

Mostly clean up `name` locator calls, in anticipation of Issue #2790.
See above comment.