diff --git a/META6.json b/META6.json
index b5b5e1b..de8316e 100644
--- a/META6.json
+++ b/META6.json
@@ -1,7 +1,7 @@
 {
     "perl"        : "6",
     "name"        : "Grammar::HTTP",
-    "version"     : "0.0.1",
+    "version"     : "0.0.2",
     "auth"        : "github:ugexe",
     "authors"     : [
         "Nick Logan",
diff --git a/lib/Grammar/HTTP/RFC5322.pm6 b/lib/Grammar/HTTP/RFC5322.pm6
index 56f45c8..7340daf 100644
--- a/lib/Grammar/HTTP/RFC5322.pm6
+++ b/lib/Grammar/HTTP/RFC5322.pm6
@@ -119,10 +119,10 @@ role Grammar::HTTP::RFC5322 {
         ]*
         [
         || <orig-date>
-        || <from>
+        || <sent-from>
         || <sender>
         || <reply-to>
-        || <to>
+        || <sent-to>
         || <cc>
         || <bcc>
         || <message-id>
@@ -137,13 +137,13 @@ role Grammar::HTTP::RFC5322 {
 
     token orig-date { "Date:" <date-time> <.CRLF> }
 
-    token from { "From:" <mailbox-list> <.CRLF> }
+    token sent-from { "From:" <mailbox-list> <.CRLF> }
 
     token sender { "Sender:" <mailbox> <.CRLF> }
 
     token reply-to { "Reply-To:" <address-list> <.CRLF> }
 
-    token to { "To:" <address-list> <.CRLF> }
+    token sent-to { "To:" <address-list> <.CRLF> }
 
     token cc { "Cc:" <address-list> <.CRLF> }
 
@@ -269,10 +269,10 @@ role Grammar::HTTP::RFC5322 {
         || <obs-return>
         || <obs-received>
         || <obs-orig-date>
-        || <obs-from>
+        || <obs-sent-from>
         || <obs-sender>
         || <obs-reply-to>
-        || <obs-to>
+        || <obs-sent-to>
         || <obs-cc>
         || <obs-bcc>
         || <obs-message-id>
@@ -295,13 +295,13 @@ role Grammar::HTTP::RFC5322 {
 
     token obs-orig-date { "Date" <.WSP>* ':' <.date-time> <.CRLF> }
 
-    token obs-from { "From" <.WSP>* ':' <.mailbox-list> <.CRLF> }
+    token obs-sent-from { "From" <.WSP>* ':' <.mailbox-list> <.CRLF> }
 
     token obs-sender { "Sender" <.WSP>* ':' <.mailbox> <.CRLF> }
 
     token obs-reply-to { "Reply-To" <.WSP>* ':' <.address-list> <.CRLF> }
 
-    token obs-to { "To" <.WSP>* ':' <.address-list> <.CRLF> }
+    token obs-sent-to { "To" <.WSP>* ':' <.address-list> <.CRLF> }
 
     token obs-cc { "Cc" <.WSP>* ':' <.address-list> <.CRLF> }
 
diff --git a/lib/Grammar/HTTP/RFC6854.pm6 b/lib/Grammar/HTTP/RFC6854.pm6
index ac19854..56d210a 100644
--- a/lib/Grammar/HTTP/RFC6854.pm6
+++ b/lib/Grammar/HTTP/RFC6854.pm6
@@ -1,9 +1,9 @@
 # Update to Internet Message Format to Allow Group Syntax in the "From:" and "Sender:" Header Fields
 
 role Grammar::HTTP::RFC6854 {
-    my token from     { "From:" [<mailbox-list> || <address-list>] <.CRLF> }
-    my token sender   { "Sender:" [<mailbox> || <address>] <.CRLF>         }
-    my token reply-to { "Reply-To:" <address-list> <.CRLF>                 }
+    my token sent-from { "From:" [<mailbox-list> || <address-list>] <.CRLF> }
+    my token sender    { "Sender:" [<mailbox> || <address>] <.CRLF>         }
+    my token reply-to  { "Reply-To:" <address-list> <.CRLF>                 }
 
     my token resent-from   { "Resent-From:" [<mailbox-list> || <address-list>] <.CRLF> }
     my token resent-sender { "Resent-Sender:" [<mailbox> || <address>] <.CRLF>         }