shortened some type names and enforced encoding rules