diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index ef49577..60a7f2c 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -106,7 +106,7 @@
 "map"                { return tok_map;                  }
 "list"               { return tok_list;                 }
 "set"                { return tok_set;                  }
-"async"              { return tok_async;                }
+"async"              { return tok_oneway;               }
 "typedef"            { return tok_typedef;              }
 "struct"             { return tok_struct;               }
 "exception"          { return tok_xception;             }
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 743fa2c..b6bdf64 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -120,7 +120,7 @@
 /**
  * Function modifiers
  */
-%token tok_async
+%token tok_oneway
 
 /**
  * Thrift language keywords
@@ -189,7 +189,7 @@
 
 %type<tstruct>   Throws
 %type<tservice>  Extends
-%type<tbool>     Async
+%type<tbool>     Oneway
 %type<tbool>     XsdAll
 %type<tbool>     XsdOptional
 %type<tbool>     XsdNillable
@@ -778,7 +778,7 @@
     }
 
 Function:
-  CaptureDocText Async FunctionType tok_identifier '(' FieldList ')' Throws CommaOrSemicolonOptional
+  CaptureDocText Oneway FunctionType tok_identifier '(' FieldList ')' Throws CommaOrSemicolonOptional
     {
       $6->set_name(std::string($4) + "_args");
       $$ = new t_function($3, $4, $6, $8, $2);
@@ -787,8 +787,8 @@
       }
     }
 
-Async:
-  tok_async
+Oneway:
+  tok_oneway
     {
       $$ = true;
     }