Fix interface naming and other cleanup

[pnwpedro]

Problem

While working through another PR, I noticed some cruft and naming inconsistencies that should be cleaned up.

Solution

Clean it up! And do it without introducing behavior changes.