Address some review feedback.

Author: jpobst

src/Java.Interop.Tools.JavaTypeSystem/Adapters/JavaXmlApiExporter.cs

@@ -26,9 +26,11 @@ public static void Save (JavaTypeCollection types, XmlWriter writer)
 			if (types.Platform.HasValue ())
 				writer.WriteAttributeString ("platform", types.Platform);
 
+			writer.WriteAttributeString ("api-source", "JavaTypeSystem");
+
 			foreach (var pkg in types.Packages.Values) {
 
-				if (!pkg.Types.Any (t => !t.IsReferenceOnly))
+				if (!pkg.Types.Any (t => !t.IsReferencedOnly))
 					continue;
 
 				writer.WriteStartElement ("package");
@@ -41,7 +43,7 @@ public static void Save (JavaTypeCollection types, XmlWriter writer)
 					writer.WriteAttributeString ("jni-name", pkg.JniName);
 
 				foreach (var type in pkg.Types) {
-					if (type.IsReferenceOnly)
+					if (type.IsReferencedOnly)
 						continue; // skip reference only types
 
 					SaveType (type, writer);

src/Java.Interop.Tools.JavaTypeSystem/Adapters/ManagedApiImporter.cs

@@ -213,7 +213,7 @@ static JavaParameterModel ParseParameterModel (JavaMethodModel parent, JniTypeNa
 
 		static void AddReferenceTypeRecursive (JavaTypeModel type, JavaTypeCollection collection)
 		{
-			collection.AddReferenceType (type);
+			collection.AddReferencedType (type);
 
 			foreach (var nested in type.NestedTypes)
 				AddReferenceTypeRecursive (nested, collection);

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaClassModel.cs

@@ -41,7 +41,7 @@ public override void Resolve (JavaTypeCollection types, List<JavaUnresolvableMod
 				// is a reference only type, we need to force it to resolve here. This will be
 				// needed later when we attempt to resolve base methods.
 				try {
-					if (BaseTypeReference.ReferencedType is JavaClassModel klass && klass.FullName != "java.lang.Object" && klass.BaseTypeReference is null && klass.IsReferenceOnly)
+					if (BaseTypeReference.ReferencedType is JavaClassModel klass && klass.FullName != "java.lang.Object" && klass.BaseTypeReference is null && klass.IsReferencedOnly)
 						klass.Resolve (types, unresolvables);
 				} catch (JavaTypeResolutionException) {
 					// Ignore

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs

@@ -22,7 +22,7 @@ public abstract class JavaTypeModel : IJavaResolvable
 		public string Deprecated { get; }
 		public bool IsStatic { get; }
 		public string ExtendedJniSignature { get; }
-		public bool IsReferenceOnly { get; internal set; }
+		public bool IsReferencedOnly { get; internal set; }
 
 		public JavaPackage Package { get; }
 		public JavaTypeModel? ParentType { get; internal set; }
@@ -56,9 +56,6 @@ protected JavaTypeModel (JavaPackage javaPackage, string javaNestedName, string
 		/// </summary>
 		public string FullName {
 			get {
-				if (Name == "boolean")
-					return "bool";
-
 				if (ParentType != null)
 					return $"{ParentType.FullName}.{Name}";
 

src/Java.Interop.Tools.JavaTypeSystem/JavaTypeCollection.cs

@@ -9,7 +9,7 @@ public class JavaTypeCollection
 		readonly Dictionary<string, JavaPackage> packages = new Dictionary<string, JavaPackage> ();
 		readonly Dictionary<string, JavaTypeModel> types = new Dictionary<string, JavaTypeModel> ();
 		readonly Dictionary<string, JavaTypeModel> types_flattened = new Dictionary<string, JavaTypeModel> ();
-		readonly Dictionary<string, JavaTypeModel> reference_types_flattened = new Dictionary<string, JavaTypeModel> ();
+		readonly Dictionary<string, JavaTypeModel> referenced_types_flattened = new Dictionary<string, JavaTypeModel> ();
 		readonly Dictionary<string, JavaTypeModel> built_in_types = new Dictionary<string, JavaTypeModel> ();
 
 		// Expose ReadOnly versions so internal type management cannot be bypassed
@@ -21,7 +21,7 @@ public class JavaTypeCollection
 		// We only keep a flattened version of reference types. The main issue is that the Managed nesting
 		// may not match the Java nesting (ie: types nested in Java interfaces that C# originally didn't support).
 		// Since we don't actually *need* this model to be nested it's simpler to keep them flattened.
-		public IReadOnlyDictionary<string, JavaTypeModel> ReferenceTypesFlattened => reference_types_flattened;
+		public IReadOnlyDictionary<string, JavaTypeModel> ReferencedTypesFlattened => referenced_types_flattened;
 
 		public string? ApiSource { get; set; }
 		public string? Platform { get; set; }
@@ -91,11 +91,11 @@ public bool AddType (JavaTypeModel type)
 		/// <summary>
 		/// Adds a reference type to the collection.
 		/// </summary>
-		public void AddReferenceType (JavaTypeModel type)
+		public void AddReferencedType (JavaTypeModel type)
 		{
-			type.IsReferenceOnly = true;
+			type.IsReferencedOnly = true;
 
-			reference_types_flattened [type.FullName] = type;
+			referenced_types_flattened [type.FullName] = type;
 		}
 
 		// This is a little trickier than we may initially think, because nested classes
@@ -245,7 +245,7 @@ bool RemoveResolvedType (JavaTypeModel type)
 				return value;
 
 			// Finally reference types
-			if (ReferenceTypesFlattened.TryGetValue (type, out var ref_type))
+			if (ReferencedTypesFlattened.TryGetValue (type, out var ref_type))
 				return ref_type;
 
 			// We moved this type to "mono.android.app.IntentService" which makes this