diff --git a/rosidl_generator_cpp/resource/msg__struct.hpp.em b/rosidl_generator_cpp/resource/msg__struct.hpp.em
index 8237f4e6c..a304ed78b 100644
--- a/rosidl_generator_cpp/resource/msg__struct.hpp.em
+++ b/rosidl_generator_cpp/resource/msg__struct.hpp.em
@@ -68,7 +68,7 @@ for member in message.structure.members:
 
 @{
 deprecated_macro_name = \
-    '__'.join(['DEPRECATED', package_name] + list(interface_path.parents[0].parts) + [interface_path.stem])
+    '__'.join(['DEPRECATED', package_name] + list(interface_path.parents[0].parts) + [message.structure.type.name])
 }@
 #ifndef _WIN32
 # define @(deprecated_macro_name) __attribute__((deprecated))