--- old/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/util/RulesToolkit.java	2018-09-19 06:26:32.000000000 -0700
+++ new/core/org.openjdk.jmc.flightrecorder.rules/src/main/java/org/openjdk/jmc/flightrecorder/rules/util/RulesToolkit.java	2018-09-19 06:26:32.000000000 -0700
@@ -111,19 +111,20 @@
 	public static final String REC_SETTING_NAME_PERIOD = "period"; //$NON-NLS-1$
 	public static final String REC_SETTING_PERIOD_EVERY_CHUNK = "everyChunk"; //$NON-NLS-1$
 
+	/*
+	 * Returns the type name, as available in the recording settings, or simply the type id, if not
+	 * available.
+	 */
 	private static final IAccessorFactory<String> TYPE_NAME_ACCESSOR_FACTORY = new IAccessorFactory<String>() {
-
 		@Override
-		public <T> IMemberAccessor<String, T> getAccessor(IType<T> type) {
+		public <T> IMemberAccessor<String, T> getAccessor(final IType<T> type) {
 			final IMemberAccessor<LabeledIdentifier, T> ta = JdkAttributes.REC_SETTING_FOR.getAccessor(type);
 			return new IMemberAccessor<String, T>() {
-
 				@Override
 				public String getMember(T inObject) {
-					LabeledIdentifier eventType = ta.getMember(inObject);
-					return eventType == null ? null : eventType.getName();
+					LabeledIdentifier labeledIdentifier = ta.getMember(inObject);
+					return labeledIdentifier == null ? type.getIdentifier() : labeledIdentifier.getName();
 				}
-
 			};
 		}
 	};