[TASK] Consistent naming

Fixes #186