Rename org. Closes #1820