diff --git a/rmw/include/rmw/event.h b/rmw/include/rmw/event.h
index 7af530d8..861415ff 100644
--- a/rmw/include/rmw/event.h
+++ b/rmw/include/rmw/event.h
@@ -37,13 +37,13 @@ typedef enum rmw_event_type_e
   RMW_EVENT_REQUESTED_DEADLINE_MISSED,
   RMW_EVENT_REQUESTED_QOS_INCOMPATIBLE,
   RMW_EVENT_MESSAGE_LOST,
-  RMW_EVENT_SUBSCRIPTION_INCONSISTENT_TOPIC,
+  RMW_EVENT_SUBSCRIPTION_INCOMPATIBLE_TYPE,
 
   // publisher events
   RMW_EVENT_LIVELINESS_LOST,
   RMW_EVENT_OFFERED_DEADLINE_MISSED,
   RMW_EVENT_OFFERED_QOS_INCOMPATIBLE,
-  RMW_EVENT_PUBLISHER_INCONSISTENT_TOPIC,
+  RMW_EVENT_PUBLISHER_INCOMPATIBLE_TYPE,
 
   // sentinel value
   RMW_EVENT_INVALID
diff --git a/rmw/include/rmw/events_statuses/events_statuses.h b/rmw/include/rmw/events_statuses/events_statuses.h
index df353038..4bd01a15 100644
--- a/rmw/include/rmw/events_statuses/events_statuses.h
+++ b/rmw/include/rmw/events_statuses/events_statuses.h
@@ -16,7 +16,7 @@
 #define RMW__EVENTS_STATUSES__EVENTS_STATUSES_H_
 
 #include "rmw/events_statuses/incompatible_qos.h"
-#include "rmw/events_statuses/inconsistent_topic.h"
+#include "rmw/events_statuses/incompatible_type.h"
 #include "rmw/events_statuses/liveliness_changed.h"
 #include "rmw/events_statuses/liveliness_lost.h"
 #include "rmw/events_statuses/message_lost.h"
diff --git a/rmw/include/rmw/events_statuses/inconsistent_topic.h b/rmw/include/rmw/events_statuses/incompatible_type.h
similarity index 63%
rename from rmw/include/rmw/events_statuses/inconsistent_topic.h
rename to rmw/include/rmw/events_statuses/incompatible_type.h
index a69c2948..9471e24e 100644
--- a/rmw/include/rmw/events_statuses/inconsistent_topic.h
+++ b/rmw/include/rmw/events_statuses/incompatible_type.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RMW__EVENTS_STATUSES__INCONSISTENT_TOPIC_H_
-#define RMW__EVENTS_STATUSES__INCONSISTENT_TOPIC_H_
+#ifndef RMW__EVENTS_STATUSES__INCOMPATIBLE_TYPE_H_
+#define RMW__EVENTS_STATUSES__INCOMPATIBLE_TYPE_H_
 
 #include <stdint.h>
 
@@ -24,17 +24,17 @@ extern "C"
 {
 #endif
 
-/// Inconsistent topic information provided by a topic.
-typedef struct RMW_PUBLIC_TYPE rmw_inconsistent_topic_status_s
+/// Incompatible type information provided by a topic.
+typedef struct RMW_PUBLIC_TYPE rmw_incompatible_type_status_s
 {
-  /// Lifetime cumulative number of inconsistent topics detected.
+  /// Lifetime cumulative number of incompatible types detected.
   int32_t total_count;
-  /// The incremental number of inconsistent topics detected since the status was read.
+  /// The incremental number of incompatible types detected since the status was read.
   int32_t total_count_change;
-} rmw_inconsistent_topic_status_t;
+} rmw_incompatible_type_status_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // RMW__EVENTS_STATUSES__INCONSISTENT_TOPIC_H_
+#endif  // RMW__EVENTS_STATUSES__INCOMPATIBLE_TYPE_H_