diff --git a/rmw_email_cpp/include/rmw_email_cpp/types.hpp b/rmw_email_cpp/include/rmw_email_cpp/types.hpp
index a895704f..8bcde5e5 100644
--- a/rmw_email_cpp/include/rmw_email_cpp/types.hpp
+++ b/rmw_email_cpp/include/rmw_email_cpp/types.hpp
@@ -26,7 +26,7 @@
 #include "email/wait_set.hpp"
 #include "rmw/rmw.h"
 
-struct rmw_context_impl_t
+struct rmw_context_impl_s
 {
   // TODO(christophebedard) move to graph cache handler?
   rmw_guard_condition_t * graph_guard_condition{nullptr};
@@ -36,10 +36,10 @@ struct rmw_context_impl_t
 
   bool is_shutdown{false};
 
-  rmw_context_impl_t();
+  rmw_context_impl_s();
 
   /// Context destruction, called when deleting this.
-  ~rmw_context_impl_t();
+  ~rmw_context_impl_s();
 
   /// Called whenever a new node is created.
   rmw_ret_t
diff --git a/rmw_email_cpp/src/rmw_init.cpp b/rmw_email_cpp/src/rmw_init.cpp
index e3d4ec10..60c5f3f8 100644
--- a/rmw_email_cpp/src/rmw_init.cpp
+++ b/rmw_email_cpp/src/rmw_init.cpp
@@ -103,12 +103,12 @@ extern "C" rmw_ret_t rmw_init_options_fini(rmw_init_options_t * init_options)
   return ret;
 }
 
-rmw_context_impl_t::rmw_context_impl_t()
+rmw_context_impl_s::rmw_context_impl_s()
 {
   RMW_EMAIL_LOG_DEBUG("initializing context implementation");
 }
 
-rmw_context_impl_t::~rmw_context_impl_t()
+rmw_context_impl_s::~rmw_context_impl_s()
 {
   RMW_EMAIL_LOG_DEBUG("shutting down context implementation");
   // Shutdown middleware
@@ -124,7 +124,7 @@ rmw_context_impl_t::~rmw_context_impl_t()
 }
 
 rmw_ret_t
-rmw_context_impl_t::init(rmw_init_options_t * options, size_t domain_id)
+rmw_context_impl_s::init(rmw_init_options_t * options, size_t domain_id)
 {
   static_cast<void>(options);
   // There's no concept of "domain" with email, duh
@@ -159,7 +159,7 @@ rmw_context_impl_t::init(rmw_init_options_t * options, size_t domain_id)
 }
 
 rmw_ret_t
-rmw_context_impl_t::fini()
+rmw_context_impl_s::fini()
 {
   std::scoped_lock<std::mutex> lock(mutex_initialization);
   if (0u != --this->node_count) {
@@ -171,7 +171,7 @@ rmw_context_impl_t::fini()
 }
 
 void
-rmw_context_impl_t::cleanup()
+rmw_context_impl_s::cleanup()
 {
   if (this->graph_guard_condition) {
     rmw_email_cpp::destroy_guard_condition(this->graph_guard_condition);