consistent naming

Closes issue #5