Refine some names.

Addresses the bug portion of issue #21.