fix to match new header/class names