corrected names, closes #9