diff --git a/rcl/src/rcl/arguments_impl.h b/rcl/src/rcl/arguments_impl.h
index 7eb32c031..a7e85dd0f 100644
--- a/rcl/src/rcl/arguments_impl.h
+++ b/rcl/src/rcl/arguments_impl.h
@@ -61,7 +61,7 @@ typedef struct rcl_arguments_impl_t
   /// A boolean value indicating if the external lib handler should be used for log output
   bool log_ext_lib_disabled;
 
-  /// Security context to be used.
+  /// Enclave to be used.
   char * enclave;
 
   /// Allocator used to allocate objects in this struct
diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c
index cbf05c4e1..539f02835 100644
--- a/rcl/src/rcl/init.c
+++ b/rcl/src/rcl/init.c
@@ -195,7 +195,7 @@ rcl_init(
   }
   if (RCL_ENCLAVE_NAME_VALID != validation_result) {
     RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
-      "Security context name is not valid: '%s'. Invalid index: %zu",
+      "Enclave name is not valid: '%s'. Invalid index: %zu",
       rcl_enclave_name_validation_result_string(validation_result),
       invalid_index);
     fail_ret = RMW_RET_ERROR;