diff --git a/include/continuable/continuable-primitives.hpp b/include/continuable/continuable-primitives.hpp
index ce3b688..fb7cb82 100644
--- a/include/continuable/continuable-primitives.hpp
+++ b/include/continuable/continuable-primitives.hpp
@@ -44,20 +44,20 @@ namespace cti {
 /// struct continuation {
 ///   void operator() (callback<Args...>);
 ///   bool operator() (cti::is_ready_arg_t) const;
-///   std::tuple<Args...> operator() (cti::get_arg_t);
+///   std::tuple<Args...> operator() (cti::query_arg_t);
 /// };
 /// template<typename T>
 /// struct continuation<T> {
 ///   template<typename Callback>
 ///   void operator() (callback<T>);
 ///   bool operator() (cti::is_ready_arg_t) const;
-///   T operator() (cti::get_arg_t);
+///   T operator() (cti::query_arg_t);
 /// };
 /// template<>
 /// struct continuation<void> {
 ///   void operator() (callback<>);
 ///   bool operator() (cti::is_ready_arg_t) const;
-///   void operator() (cti::get_arg_t);
+///   void operator() (cti::query_arg_t);
 /// };
 /// ```
 /// ```cpp
@@ -82,7 +82,7 @@ struct is_ready_arg_t {};
 /// It's required that the query of is_ready_arg_t returns true.
 ///
 /// \since 4.0.0
-struct get_arg_t {};
+struct query_arg_t {};
 
 /// Represents the tag type that is used to disambiguate the
 /// callback operator() in order to take the exception asynchronous chain.
diff --git a/include/continuable/detail/core/base.hpp b/include/continuable/detail/core/base.hpp
index 535a14a..507bd88 100644
--- a/include/continuable/detail/core/base.hpp
+++ b/include/continuable/detail/core/base.hpp
@@ -92,7 +92,7 @@ struct ready_continuation {
     return true;
   }
 
-  std::tuple<Args...> operator()(get_arg_t) && {
+  std::tuple<Args...> operator()(query_arg_t) && {
     return std::move(values_);
   }
 };
@@ -114,7 +114,7 @@ struct ready_continuation<> {
     return true;
   }
 
-  std::tuple<> operator()(get_arg_t) && {
+  std::tuple<> operator()(query_arg_t) && {
     return std::make_tuple();
   }
 };
@@ -141,7 +141,7 @@ struct proxy_continuable<traits::identity<Args...>, Continuation>
     return false;
   }
 
-  std::tuple<Args...> operator()(get_arg_t) && {
+  std::tuple<Args...> operator()(query_arg_t) && {
     util::unreachable();
   }
 };
@@ -754,7 +754,7 @@ struct chained_continuation<traits::identity<Args...>, HandleResults,
     return false;
   }
 
-  std::tuple<Args...> operator()(get_arg_t) && {
+  std::tuple<Args...> operator()(query_arg_t) && {
     util::unreachable();
   }
 };