Fix names of extension types and subsequent fallout.
9 files changed