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

diff --git a/src/loader.nit b/src/loader.nit
index 7edf41a..169d52e 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -39,7 +39,7 @@ module loader
 
 import modelbuilder_base
 import ini
-import picnit_shared
+import nitpm_shared
 
 redef class ToolContext
 	# Option --path
@@ -66,9 +66,9 @@ redef class ModelBuilder
 		# Setup the paths value
 		paths.append(toolcontext.opt_path.value)
 
-		# Packages managed by picnit, only use when not testing with tests.sh
+		# Packages managed by nitpm, only use when not testing with tests.sh
 		if "NIT_TESTING_TESTS_SH".environ != "true" then
-			paths.add picnit_lib_dir
+			paths.add nitpm_lib_dir
 		end
 
 		var path_env = "NIT_PATH".environ
@@ -477,7 +477,7 @@ redef class ModelBuilder
 			# Attach homonymous `ini` file to the package
 			var inipath = path.dirname / "{pn}.ini"
 			if inipath.file_exists then
-				var ini = new ConfigTree(inipath)
+				var ini = new IniFile.from_file(inipath)
 				mpackage.ini = ini
 			end
 		end
@@ -543,7 +543,7 @@ redef class ModelBuilder
 		var parent = null
 		var inipath = dirpath / "package.ini"
 		if inipath.file_exists then
-			ini = new ConfigTree(inipath)
+			ini = new IniFile.from_file(inipath)
 		end
 
 		if ini == null then
@@ -1178,7 +1178,7 @@ redef class MPackage
 	# The `ini` file is given as is and might contain invalid or missing information.
 	#
 	# Some packages, like stand-alone packages or virtual packages have no `ini` file associated.
-	var ini: nullable ConfigTree = null
+	var ini: nullable IniFile = null
 
 	# Array of relative source paths excluded according to the `source.exclude` key of the `ini`
 	var excludes: nullable Array[String] is lazy do