Minor name references cleanup.