Fixing up some missed terminology changes (#9)