New names

Fixes issue #8