Hopefully finalized renaming. Fixes #2