Refactor/name change. Closes #21