Fixed naming. Closes #83.