Fixes #15 renames