Fix typo and fix reference to old class that was renamed

This was found while reviewing gh-30