Finished renaming. Closes #118