Renamed some basic types: made them slightly more annoying!  Reasoning: They are meant to be typedef'd, so their names should be annoying and descriptive.