Name and impl cleanup.

Name changes as inspired by discussion on #23.