Move around a few names, since types and modules cannot have the same names.
I like the new names.