diff --git a/src/KokkosComm.hpp b/src/KokkosComm.hpp
index ae4b5cb2..342a2dcb 100644
--- a/src/KokkosComm.hpp
+++ b/src/KokkosComm.hpp
@@ -29,31 +29,10 @@
 #include <Kokkos_Core.hpp>
 
 namespace KokkosComm {
+using Impl::alltoall;
+using Impl::irecv;
+using Impl::isend;
+using Impl::recv;
+using Impl::send;
 
-template <CommMode SendMode = CommMode::Default, KokkosExecutionSpace ExecSpace, KokkosView SendView>
-Req isend(const ExecSpace &space, const SendView &sv, int dest, int tag, MPI_Comm comm) {
-  return Impl::isend<SendMode>(space, sv, dest, tag, comm);
-}
-
-template <KokkosView RecvView>
-void irecv(RecvView &rv, int src, int tag, MPI_Comm comm, MPI_Request req) {
-  return Impl::irecv(rv, src, tag, comm, req);
-}
-
-template <CommMode SendMode = CommMode::Default, KokkosExecutionSpace ExecSpace, KokkosView SendView>
-void send(const ExecSpace &space, const SendView &sv, int dest, int tag, MPI_Comm comm) {
-  return Impl::send<SendMode>(space, sv, dest, tag, comm);
-}
-
-template <KokkosExecutionSpace ExecSpace, KokkosView RecvView>
-void recv(const ExecSpace &space, RecvView &rv, int src, int tag, MPI_Comm comm) {
-  return Impl::recv(space, rv, src, tag, comm);
-}
-
-template <KokkosExecutionSpace ExecSpace, KokkosView SendView, KokkosView RecvView>
-void alltoall(const ExecSpace &space, const SendView &sv, const size_t sendCount, const RecvView &rv,
-              const size_t recvCount, MPI_Comm comm) {
-  return Impl::alltoall(space, sv, sendCount, rv, recvCount, comm);
-}
-
-}  // namespace KokkosComm
+}  // namespace KokkosComm
\ No newline at end of file
diff --git a/unit_tests/test_isendirecv.cpp b/unit_tests/test_isendirecv.cpp
index 1a351e85..d76bf83a 100644
--- a/unit_tests/test_isendirecv.cpp
+++ b/unit_tests/test_isendirecv.cpp
@@ -54,7 +54,7 @@ void test_1d(const View1D &a) {
   } else if (1 == rank) {
     int src = 0;
     MPI_Request req;
-    KokkosComm::Impl::irecv(a, src, 0, MPI_COMM_WORLD, req);
+    KokkosComm::irecv(a, src, 0, MPI_COMM_WORLD, req);
     MPI_Wait(&req, MPI_STATUS_IGNORE);
     int errs;
     Kokkos::parallel_reduce(
@@ -87,7 +87,7 @@ void test_2d(const View2D &a) {
   } else if (1 == rank) {
     int src = 0;
     MPI_Request req;
-    KokkosComm::Impl::irecv(a, src, 0, MPI_COMM_WORLD, req);
+    KokkosComm::irecv(a, src, 0, MPI_COMM_WORLD, req);
     MPI_Wait(&req, MPI_STATUS_IGNORE);
     int errs;
     Kokkos::parallel_reduce(