Issue 5527 rename types

Some cleanups I'm sick of rebasing.

r? @pcwalton (do you agree with new names?)