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

diff --git a/src/ffi/ffi_base.nit b/src/ffi/ffi_base.nit
index 3b53826..babab08 100644
--- a/src/ffi/ffi_base.nit
+++ b/src/ffi/ffi_base.nit
@@ -99,7 +99,9 @@ end
 # Visitor for a specific languages. Works kinda like a `Phase` and is executed
 # by a `Phase`.
 class FFILanguage
-	init(ffi_language_assignation_phase: FFILanguageAssignationPhase)
+	var ffi_language_assignation_phase: FFILanguageAssignationPhase
+
+	init
 	do
 		ffi_language_assignation_phase.languages.add(self)
 	end
@@ -150,10 +152,10 @@ end
 redef class CCompilationUnit
 	fun write_as_impl(mmodule: MModule, compdir: String)
 	do
-		var base_name = "{mmodule.name}._ffi"
+		var base_name = "{mmodule.c_name}._ffi"
 
 		var h_file = "{base_name}.h"
-		var guard = "{mmodule.cname.to_s.to_upper}_NIT_H"
+		var guard = "{mmodule.c_name.to_upper}_NIT_H"
 		write_header_to_file(mmodule, "{compdir}/{h_file}", new Array[String], guard)
 
 		var c_file = "{base_name}.c"