--- old/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/parser/v1/TypeManager.java	2018-06-08 14:48:50.397931800 +0530
+++ new/core/org.openjdk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/internal/parser/v1/TypeManager.java	2018-06-08 14:48:49.356223500 +0530
@@ -120,17 +120,28 @@
 
 	private class TypeEntry {
 		private static final String STRUCT_TYPE_STACK_TRACE = "com.oracle.jfr.types.StackTrace"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_STACK_TRACE2 = "jdk.types.StackTrace"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_STACK_FRAME = "com.oracle.jfr.types.StackFrame"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_STACK_FRAME2 = "jdk.types.StackFrame"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_METHOD = "com.oracle.jfr.types.Method"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_METHOD2 = "jdk.types.Method"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_CLASS = "java.lang.Class"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_CLASS_LOADER = "com.oracle.jfr.types.ClassLoader"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_CLASS_LOADER2 = "jdk.types.ClassLoader"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_MODULE = "com.oracle.jfr.types.Module"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_MODULE2 = "jdk.types.Module"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_PACKAGE = "com.oracle.jfr.types.Package"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_PACKAGE2 = "jdk.types.Package"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_OLD_OBJECT = "com.oracle.jfr.types.OldObject"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_OLD_OBJECT2 = "jdk.types.OldObject"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_OLD_OBJECT_ARRAY = "com.oracle.jfr.types.OldObjectArray"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_OLD_OBJECT_ARRAY2 = "jdk.types.OldObjectArray"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_OLD_OBJECT_FIELD = "com.oracle.jfr.types.OldObjectField"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_OLD_OBJECT_FIELD2 = "jdk.types.OldObjectField"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_OLD_OBJECT_GC_ROOT = "com.oracle.jfr.types.OldObjectGcRoot"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_OLD_OBJECT_GC_ROOT2 = "jdk.types.OldObjectGcRoot"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_THREAD_GROUP = "com.oracle.jfr.types.ThreadGroup"; //$NON-NLS-1$
+		private static final String STRUCT_TYPE_THREAD_GROUP2 = "jdk.types.ThreadGroup"; //$NON-NLS-1$
 		private static final String STRUCT_TYPE_THREAD = "java.lang.Thread"; //$NON-NLS-1$
 
 		final ClassElement element;
@@ -188,28 +199,39 @@
 			case STRUCT_TYPE_THREAD:
 				return new ReflectiveReader(JfrThread.class, fieldCount, UnitLookup.THREAD);
 			case STRUCT_TYPE_THREAD_GROUP:
+			case STRUCT_TYPE_THREAD_GROUP2:
 				return new ReflectiveReader(JfrThreadGroup.class, fieldCount, UnitLookup.THREAD_GROUP);
 			case STRUCT_TYPE_CLASS:
 				return new ReflectiveReader(JfrJavaClass.class, fieldCount, UnitLookup.CLASS);
 			case STRUCT_TYPE_CLASS_LOADER:
+			case STRUCT_TYPE_CLASS_LOADER2:
 				return new ReflectiveReader(JfrJavaClassLoader.class, fieldCount, UnitLookup.CLASS_LOADER);
 			case STRUCT_TYPE_OLD_OBJECT_GC_ROOT:
+			case STRUCT_TYPE_OLD_OBJECT_GC_ROOT2:
 				return new ReflectiveReader(JfrOldObjectGcRoot.class, fieldCount, UnitLookup.OLD_OBJECT_GC_ROOT);
 			case STRUCT_TYPE_OLD_OBJECT:
+			case STRUCT_TYPE_OLD_OBJECT2:
 				return new ReflectiveReader(JfrOldObject.class, fieldCount, UnitLookup.OLD_OBJECT);
 			case STRUCT_TYPE_OLD_OBJECT_ARRAY:
+			case STRUCT_TYPE_OLD_OBJECT_ARRAY2:
 				return new ReflectiveReader(JfrOldObjectArray.class, fieldCount, UnitLookup.OLD_OBJECT_ARRAY);
 			case STRUCT_TYPE_OLD_OBJECT_FIELD:
+			case STRUCT_TYPE_OLD_OBJECT_FIELD2:
 				return new ReflectiveReader(JfrOldObjectField.class, fieldCount, UnitLookup.OLD_OBJECT_FIELD);
 			case STRUCT_TYPE_METHOD:
+			case STRUCT_TYPE_METHOD2:
 				return new ReflectiveReader(JfrMethod.class, fieldCount, UnitLookup.METHOD);
 			case STRUCT_TYPE_STACK_FRAME:
+			case STRUCT_TYPE_STACK_FRAME2:
 				return new ReflectiveReader(JfrFrame.class, fieldCount, UnitLookup.STACKTRACE_FRAME);
 			case STRUCT_TYPE_STACK_TRACE:
+			case STRUCT_TYPE_STACK_TRACE2:
 				return new ReflectiveReader(JfrStackTrace.class, fieldCount, UnitLookup.STACKTRACE);
 			case STRUCT_TYPE_MODULE:
+			case STRUCT_TYPE_MODULE2:
 				return new ReflectiveReader(JfrJavaModule.class, fieldCount, UnitLookup.MODULE);
 			case STRUCT_TYPE_PACKAGE:
+			case STRUCT_TYPE_PACKAGE2:
 				return new ReflectiveReader(JfrJavaPackage.class, fieldCount, UnitLookup.PACKAGE);
 			default:
 				synchronized (STRUCT_TYPES) {