thockin: Rename some type names that had "Type" in them

No Results