Change name, closes #4