Fixes #2. Finalized renaming.