Rename. Closes #358.