Renaming. Closes #198