diff --git a/src/python/ksc/cgen.py b/src/python/ksc/cgen.py
index c0171b158..202f04f97 100644
--- a/src/python/ksc/cgen.py
+++ b/src/python/ksc/cgen.py
@@ -30,7 +30,7 @@ def entry_point_cpp_type(t, use_torch):
         return scalar_type_to_cpp_map[t.kind]
     elif t.is_tuple:
         return (
-            "ks::Tuple<"
+            "std::tuple<"
             + ", ".join(
                 entry_point_cpp_type(child, use_torch) for child in t.tuple_elems()
             )
diff --git a/src/runtime/knossos-entry-points.h b/src/runtime/knossos-entry-points.h
index 16d4aaec5..004137ffe 100644
--- a/src/runtime/knossos-entry-points.h
+++ b/src/runtime/knossos-entry-points.h
@@ -42,23 +42,23 @@ struct Converter
 };
 
 template<typename ...KsElementTypes, typename ...EntryPointElementTypes>
-struct Converter<ks::Tuple<KsElementTypes...>, ks::Tuple<EntryPointElementTypes...>>
+struct Converter<ks::Tuple<KsElementTypes...>, std::tuple<EntryPointElementTypes...>>
 {
   template<size_t ...Indices>
-  static ks::Tuple<KsElementTypes...> to_ks_impl(ks::Tuple<EntryPointElementTypes...> arg, std::index_sequence<Indices...>) {
-    return ks::make_Tuple(convert_argument<KsElementTypes>(ks::get<Indices>(arg))...);
+  static ks::Tuple<KsElementTypes...> to_ks_impl(std::tuple<EntryPointElementTypes...> arg, std::index_sequence<Indices...>) {
+    return ks::make_Tuple(convert_argument<KsElementTypes>(std::get<Indices>(arg))...);
   }
 
-  static ks::Tuple<KsElementTypes...> to_ks(ks::Tuple<EntryPointElementTypes...> arg) {
+  static ks::Tuple<KsElementTypes...> to_ks(std::tuple<EntryPointElementTypes...> arg) {
     return to_ks_impl(arg, std::index_sequence_for<EntryPointElementTypes...>{});
   }
 
   template<size_t ...Indices>
-  static ks::Tuple<EntryPointElementTypes...> from_ks_impl(ks::Tuple<KsElementTypes...> ret, std::index_sequence<Indices...>) {
-    return ks::make_Tuple(convert_return_value<EntryPointElementTypes>(ks::get<Indices>(ret))...);
+  static std::tuple<EntryPointElementTypes...> from_ks_impl(ks::Tuple<KsElementTypes...> ret, std::index_sequence<Indices...>) {
+    return std::make_tuple(convert_return_value<EntryPointElementTypes>(ks::get<Indices>(ret))...);
   }
 
-  static ks::Tuple<EntryPointElementTypes...> from_ks(ks::Tuple<KsElementTypes...> ret) {
+  static std::tuple<EntryPointElementTypes...> from_ks(ks::Tuple<KsElementTypes...> ret) {
     return from_ks_impl(ret, std::index_sequence_for<KsElementTypes...>{});
   }
 };