Better naming

Fixes #8