diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift
index e7152c4..c93fed5 100644
--- a/test/ThriftTest.thrift
+++ b/test/ThriftTest.thrift
@@ -102,7 +102,7 @@
 
   Xtruct testMultiException(string arg0, string arg1) throws(Xception err1, Xception2 err2)
 
-  /* Test async void */
+  /* Test oneway void */
   async void testAsync(1:i32 secondsToSleep)
 }
 
diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 5350297..b12a4b5 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -420,7 +420,7 @@
       printf("  exception\nFAILURE\n");
     }
 
-    /* test async void */
+    /* test oneway void */
     {
         printf("testClient.testAsync(3) =>");
         uint64_t startAsync = now();
@@ -434,8 +434,8 @@
     }
 
     /**
-     * redo a simple test after the async to make sure we aren't "off by one" --
-     * if the server treated async void like normal void, this next test will
+     * redo a simple test after the oneway to make sure we aren't "off by one" --
+     * if the server treated oneway void like normal void, this next test will
      * fail since it will get the void confirmation rather than the correct
      * result. In this circumstance, the client will throw the exception:
      *
diff --git a/test/erl/src/test_disklog.erl b/test/erl/src/test_disklog.erl
index 81b7b50..0cc03bc 100644
--- a/test/erl/src/test_disklog.erl
+++ b/test/erl/src/test_disklog.erl
@@ -14,12 +14,12 @@
 
     io:format("Client started~n"),
 
-    % We have to make async calls into this client only since otherwise it will try
+    % We have to make oneway calls into this client only since otherwise it will try
     % to read from the disklog and go boom.
     {ok, ok} = thrift_client:call(Client, testAsync, [16#deadbeef]),
     io:format("Call written~n"),
 
-    % Use the send_call method to write a non-async call into the log
+    % Use the send_call method to write a non-oneway call into the log
     ok = thrift_client:send_call(Client, testString, [<<"hello world">>]),
     io:format("Non-async call sent~n"),
 
@@ -46,12 +46,12 @@
 
     io:format("Client started~n"),
 
-    % We have to make async calls into this client only since otherwise it will try
+    % We have to make oneway calls into this client only since otherwise it will try
     % to read from the disklog and go boom.
     {ok, ok} = thrift_client:call(Client, testAsync, [16#deadbeef]),
     io:format("Call written~n"),
 
-    % Use the send_call method to write a non-async call into the log
+    % Use the send_call method to write a non-oneway call into the log
     ok = thrift_client:send_call(Client, testString, [<<"hello world">>]),
     io:format("Non-async call sent~n"),