diff --git a/src/hotspot/share/prims/jvmtiH.xsl b/src/hotspot/share/prims/jvmtiH.xsl
index 6a98b4cf32b..975758b4edb 100644
--- a/src/hotspot/share/prims/jvmtiH.xsl
+++ b/src/hotspot/share/prims/jvmtiH.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -406,11 +406,11 @@ typedef </xsl:text>
 </xsl:template>
 
 <xsl:template match="typedef" mode="early">
-  <xsl:text>struct _</xsl:text>
+  <xsl:text>struct </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text>;
 </xsl:text>
-  <xsl:text>typedef struct _</xsl:text>
+  <xsl:text>typedef struct </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text> </xsl:text>
   <xsl:value-of select="@id"/>
@@ -419,7 +419,7 @@ typedef </xsl:text>
 </xsl:template>
 
 <xsl:template match="typedef" mode="body">
-  <xsl:text>struct _</xsl:text>
+  <xsl:text>struct </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text> {
 </xsl:text>
@@ -429,11 +429,11 @@ typedef </xsl:text>
 </xsl:template>
 
 <xsl:template match="uniontypedef" mode="early">
-  <xsl:text>union _</xsl:text>
+  <xsl:text>union </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text>;
 </xsl:text>
-  <xsl:text>typedef union _</xsl:text>
+  <xsl:text>typedef union </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text> </xsl:text>
   <xsl:value-of select="@id"/>
@@ -442,7 +442,7 @@ typedef </xsl:text>
 </xsl:template>
 
 <xsl:template match="uniontypedef" mode="body">
-  <xsl:text>union _</xsl:text>
+  <xsl:text>union </xsl:text>
   <xsl:value-of select="@id"/>
   <xsl:text> {
 </xsl:text>