BC break renaming #39

Fixes issue #39.