missed two of the class renames