Fix some fallout from the class rename/refactor