X-Git-Url: http://nitlanguage.org

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index 76e9b43..6e9d7ff 100644
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -44,11 +44,11 @@ private class NullablesMetricsPhase
 
 		var model = toolcontext.modelbuilder.model
 		var mclasses = new HashSet[MClass]
-		for mproject in model.mprojects do
+		for mpackage in model.mpackages do
 
-			print toolcontext.format_h2("\n ## project {mproject}")
+			print toolcontext.format_h2("\n ## package {mpackage}")
 
-			for mgroup in mproject.mgroups do
+			for mgroup in mpackage.mgroups do
 				if mgroup.mmodules.is_empty then continue
 				metrics.clear
 
@@ -140,8 +140,8 @@ private class NullableSends
 			end
 			t = t.anchor_to(self.nclassdef.mclassdef.mmodule, self.nclassdef.mclassdef.bound_mtype)
 			if t isa MNullableType then
-				var name = n.callsite.mproperty.name
-				if name == "==" or name == "!=" or name == "is_same_instance" then
+				var p = n.callsite.mproperty
+				if p.is_null_safe then
 					self.nullable_eq_sends += 1
 				else
 					self.nullable_sends += 1