diff --git a/pad.h b/pad.h
index 0877aa6c31..2f0cbe3f1e 100644
--- a/pad.h
+++ b/pad.h
@@ -57,7 +57,7 @@ struct padnamelist {
 
 struct padname_fieldinfo;
 
-#define _PADNAME_BASE \
+#define PADNAME_BASE_ \
     char *	xpadn_pv;		\
     HV *	xpadn_ourstash;		\
     union {				\
@@ -73,19 +73,19 @@ struct padname_fieldinfo;
     U8		xpadn_flags
 
 struct padname {
-    _PADNAME_BASE;
+    PADNAME_BASE_;
 };
 
 struct padname_with_str {
 #ifdef PERL_PADNAME_MINIMAL
-    _PADNAME_BASE;
+    PADNAME_BASE_;
 #else
     struct padname	xpadn_padname;
 #endif
     char		xpadn_str[1];
 };
 
-#undef _PADNAME_BASE
+#undef PADNAME_BASE_
 
 #define PADNAME_FROM_PV(s) \
     ((PADNAME *)((s) - STRUCT_OFFSET(struct padname_with_str, xpadn_str)))