Naming update

Fixes #8.