Fix inconsistent type naming.