diff --git a/asn.1/message.asn1 b/asn.1/message.asn1
index e9750ca8..2334d2ff 100644
--- a/asn.1/message.asn1
+++ b/asn.1/message.asn1
@@ -17,7 +17,7 @@ BEGIN
 EXPORTS ASN1Message;
 
 IMPORTS
-  PString, PStringList, Identity, IdentityList, StringPairList, Hash
+  PString, PStringList, Identity, IdentityList, PStringPairList, Hash
   FROM PEP { iso(1) org(3) dod(6) internet(1) private(4)
              enterprise(1) pEp(47878) basic(0) };
 
@@ -33,30 +33,26 @@ ContentDisposition ::= ENUMERATED {
     other (2)
 }
 
-Blob ::= SEQUENCE {
+PBlob ::= SEQUENCE {
     value       OCTET STRING (SIZE(0..102400000)),  -- up to 100 MB
     mime-type   PString OPTIONAL,
     filename    PString OPTIONAL,
     disposition ContentDisposition
 }
-BlobList ::= SEQUENCE OF Blob
+PBlobList ::= SEQUENCE OF PBlob
 
 
 -- For the purposes of this profile, GeneralizedTime values MUST be
 -- expressed in Coordinated Universal Time (UTC) and MUST include seconds
 -- (i.e., times are YYYYMMDDHHMMSSZ), even where the number of seconds
 -- is zero.  GeneralizedTime values MUST NOT include fractional seconds.
--- To make this more explicit, the type-name "Timestamp" is used in this
--- profile.
-
-Timestamp ::= GeneralizedTime
 
 
 ASN1Message ::= SEQUENCE {
     direction   MessageDirection OPTIONAL, -- used only in "inner" messages
     id          PString          OPTIONAL, -- UTF-8 string of message ID
-    sent        Timestamp        OPTIONAL,  -- when the message is sent
-    recv        Timestamp        OPTIONAL,  -- when the message is received
+    sent        GeneralizedTime        OPTIONAL,  -- when the message is sent
+    recv        GeneralizedTime        OPTIONAL,  -- when the message is received
     from        Identity,                   -- whom the message is from
     -- At least one of to, cc must not be an empty list
     -- FIXME: Can this be constrained?
@@ -74,7 +70,7 @@ ASN1Message ::= SEQUENCE {
     -- internal: refered_by _message-ref-list
     keywords    PStringList     OPTIONAL, -- list of UTF-8 strings with keywords
     comments    PString         OPTIONAL, -- UTF-8 string with comments
-    opt-fields  StringPairList  OPTIONAL, -- optional fields
+    opt-fields  PStringPairList OPTIONAL, -- optional fields
     sender-fpr  Hash            OPTIONAL,  -- fingerprint of sending signer
 
     -- At least one of shortmsg, longmsg, longmsg-formatted must be present
@@ -90,7 +86,7 @@ ASN1Message ::= SEQUENCE {
     longmsg-formatted UTF8String   OPTIONAL, -- UTF-8 string of long message
                                              -- (formatted)
 
-    attachments BlobList        OPTIONAL     -- blobs with attachments
+    attachments PBlobList        OPTIONAL     -- blobs with attachments
     -- internal: rawmsg
 }
 
diff --git a/asn.1/pEp.asn1 b/asn.1/pEp.asn1
index c99c1307..21606228 100644
--- a/asn.1/pEp.asn1
+++ b/asn.1/pEp.asn1
@@ -12,7 +12,7 @@ DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::=
 
 BEGIN
 
-EXPORTS Identity, IdentityList, TID, Hash, Version, Rating, PString, PStringList, StringPair, StringPairList;
+EXPORTS Identity, IdentityList, TID, Hash, Version, Rating, PString, PStringList, PStringPair, PStringPairList;
 
 ISO639-1 ::= PrintableString(FROM ("a".."z")) (SIZE(2))
 Hex ::= PrintableString(FROM ("A".."F" | "0".."9"))
@@ -63,12 +63,12 @@ Rating ::= ENUMERATED {
     under-attack (-3)
 }
 
-StringPair ::= SEQUENCE {
+PStringPair ::= SEQUENCE {
     key      PString,
     value    PString
 }
 
-StringPairList ::= SEQUENCE OF StringPair
+PStringPairList ::= SEQUENCE OF PStringPair
 
 END