From ef06db1bb46869b89fa1636c00c18b772423cbbf Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Thu, 11 Jul 2013 11:27:56 +0200
Subject: [PATCH] rename 'package' to 'module'

Signed-off-by: Jean Privat <jean@pryen.org>
---
 lib/standard/collection/abstract_collection.nit    |    2 +-
 lib/standard/collection/array.nit                  |    2 +-
 lib/standard/collection/collection.nit             |    2 +-
 lib/standard/collection/hash_collection.nit        |    2 +-
 lib/standard/collection/list.nit                   |    2 +-
 lib/standard/collection/range.nit                  |    2 +-
 lib/standard/collection/sorter.nit                 |    2 +-
 lib/standard/exec.nit                              |    2 +-
 lib/standard/file.nit                              |    2 +-
 lib/standard/hash.nit                              |    2 +-
 lib/standard/kernel.nit                            |    2 +-
 lib/standard/math.nit                              |    2 +-
 lib/standard/standard.nit                          |    2 +-
 lib/standard/stream.nit                            |    2 +-
 lib/standard/string.nit                            |    2 +-
 lib/standard/string_search.nit                     |    2 +-
 lib/standard/time.nit                              |    2 +-
 lib/symbol.nit                                     |    2 +-
 src/abstracttool.nit                               |    2 +-
 src/analysis/allocate_iregister_slots.nit          |    2 +-
 src/analysis/analysis.nit                          |    2 +-
 src/analysis/icode_dump.nit                        |    2 +-
 src/analysis/inline_methods.nit                    |    2 +-
 src/compiling/compiling.nit                        |    2 +-
 src/compiling/compiling_base.nit                   |    2 +-
 src/compiling/compiling_global.nit                 |    2 +-
 src/compiling/compiling_icode.nit                  |    2 +-
 src/compiling/icode_generator.nit                  |    2 +-
 src/compiling/table_computation.nit                |    2 +-
 src/compiling_writer.nit                           |    2 +-
 src/git-gen-version.sh                             |    2 +-
 src/global/cha_analysis.nit                        |    2 +-
 src/global/dead_method_removal.nit                 |    2 +-
 src/global/global.nit                              |    2 +-
 src/global/inline_get_and_set.nit                  |    2 +-
 src/global/instantiated_type_analysis.nit          |    2 +-
 src/global/reachable_as_init.nit                   |    2 +-
 src/global/reachable_as_init_impl.nit              |    2 +-
 src/global/reachable_from_init_method_analysis.nit |    2 +-
 .../reachable_from_init_method_analysis_impl.nit   |    2 +-
 src/global/reachable_method_analysis.nit           |    2 +-
 src/global/remove_out_of_init_get_test.nit         |    2 +-
 src/global/rta_analysis.nit                        |    2 +-
 src/icode/icode_base.nit                           |    2 +-
 src/icode/icode_builder.nit                        |    2 +-
 src/location.nit                                   |    2 +-
 src/metamodel/abstractmetamodel.nit                |    2 +-
 src/metamodel/genericity.nit                       |    2 +-
 src/metamodel/inheritance.nit                      |    2 +-
 src/metamodel/metamodel.nit                        |    2 +-
 src/metamodel/partial_order.nit                    |    2 +-
 src/metamodel/static_type.nit                      |    2 +-
 src/metamodel/type_formal.nit                      |    2 +-
 src/metamodel/vararg.nit                           |    2 +-
 src/metamodel/virtualtype.nit                      |    2 +-
 src/mmloader.nit                                   |    2 +-
 src/nitc.nit                                       |    2 +-
 src/nitdoc.nit                                     |    2 +-
 src/parser/lexer.nit                               |    2 +-
 src/parser/parser.nit                              |    2 +-
 src/parser/parser_abs.nit                          |    2 +-
 src/parser/parser_nodes.nit                        |    2 +-
 src/parser/parser_prod.nit                         |    2 +-
 src/parser/tables.nit                              |    2 +-
 src/parser/xss/main.xss                            |    8 ++++----
 src/primitive_info.nit                             |    2 +-
 src/program.nit                                    |    2 +-
 src/simple_misc_analysis.nit                       |    2 +-
 src/syntax/flow.nit                                |    2 +-
 src/syntax/icode_generation.nit                    |    2 +-
 src/syntax/mmbuilder.nit                           |    2 +-
 src/syntax/scope.nit                               |    2 +-
 src/syntax/syntax.nit                              |    2 +-
 src/syntax/syntax_base.nit                         |    2 +-
 src/syntax/typing.nit                              |    2 +-
 src/test_parser.nit                                |    2 +-
 src/toolcontext.nit                                |    2 +-
 src/utils.nit                                      |    2 +-
 tests/sav/test_parser_args1.res                    |    8 ++++----
 tests/sav/test_parser_args2.res                    |    6 +++---
 80 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/lib/standard/collection/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit
index 1217a70..4a560d2 100644
--- a/lib/standard/collection/abstract_collection.nit
+++ b/lib/standard/collection/abstract_collection.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # This module define several abstract collection classes.
-package abstract_collection
+module abstract_collection
 
 import kernel
 
diff --git a/lib/standard/collection/array.nit b/lib/standard/collection/array.nit
index e010470..9c34b3a 100644
--- a/lib/standard/collection/array.nit
+++ b/lib/standard/collection/array.nit
@@ -13,7 +13,7 @@
 
 # This module introduces the standard array structure.
 # It also implements two other abstract collections : ArrayMap and ArraySet
-package array
+module array
 
 import abstract_collection
 
diff --git a/lib/standard/collection/collection.nit b/lib/standard/collection/collection.nit
index 27ed996..cce8495 100644
--- a/lib/standard/collection/collection.nit
+++ b/lib/standard/collection/collection.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # This module define several collection classes.
-package collection
+module collection
 
 import abstract_collection
 import range
diff --git a/lib/standard/collection/hash_collection.nit b/lib/standard/collection/hash_collection.nit
index da782d5..13c9f09 100644
--- a/lib/standard/collection/hash_collection.nit
+++ b/lib/standard/collection/hash_collection.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Introduce Hashmap and Hashset.
-package hash_collection
+module hash_collection
 
 import array
 import hash
diff --git a/lib/standard/collection/list.nit b/lib/standard/collection/list.nit
index 804c629..3a59a49 100644
--- a/lib/standard/collection/list.nit
+++ b/lib/standard/collection/list.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # This module handle double linked lists
-package list
+module list
 
 import abstract_collection
 
diff --git a/lib/standard/collection/range.nit b/lib/standard/collection/range.nit
index 882ed1f..f356c6f 100644
--- a/lib/standard/collection/range.nit
+++ b/lib/standard/collection/range.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Module for range of discrete objects.
-package range
+module range
 
 import abstract_collection
 
diff --git a/lib/standard/collection/sorter.nit b/lib/standard/collection/sorter.nit
index d023374..ecfa1c0 100644
--- a/lib/standard/collection/sorter.nit
+++ b/lib/standard/collection/sorter.nit
@@ -13,7 +13,7 @@
 # This module contains classes used to sorts arrays.
 # In order to provide your own sort class you should define a subclass of `AbstractSorter` with
 # a custom `AbstractSorter::compare` function.
-package sorter
+module sorter
 
 import array
 
diff --git a/lib/standard/exec.nit b/lib/standard/exec.nit
index f71ce54..c221632 100644
--- a/lib/standard/exec.nit
+++ b/lib/standard/exec.nit
@@ -13,7 +13,7 @@
 
 # Invocation and management of operating system sub-processes.
 # Standard input and output can be handled through streams.
-package exec 
+module exec
 
 import stream
 
diff --git a/lib/standard/file.nit b/lib/standard/file.nit
index 764ca75..6fb80f6 100644
--- a/lib/standard/file.nit
+++ b/lib/standard/file.nit
@@ -13,7 +13,7 @@
 # another product.
 
 # File manipulations (create, read, write, etc.)
-package file
+module file
 
 intrude import stream
 intrude import string
diff --git a/lib/standard/hash.nit b/lib/standard/hash.nit
index 9687ecf..604dc97 100644
--- a/lib/standard/hash.nit
+++ b/lib/standard/hash.nit
@@ -12,7 +12,7 @@
 
 # Hashable things.
 # It introduces an hash function in objects.
-package hash
+module hash
 
 import kernel
 
diff --git a/lib/standard/kernel.nit b/lib/standard/kernel.nit
index efb6819..a8e4f0d 100644
--- a/lib/standard/kernel.nit
+++ b/lib/standard/kernel.nit
@@ -13,7 +13,7 @@
 
 # Most minimal classes and methods.
 # This module is the root of the standard module hierarchy.
-package kernel
+module kernel
 
 import end # Mark this module is a top level one. (must be only one)
 
diff --git a/lib/standard/math.nit b/lib/standard/math.nit
index aa74174..a9a0c89 100644
--- a/lib/standard/math.nit
+++ b/lib/standard/math.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Mathematical operations
-package math
+module math
 
 import kernel
 import collection
diff --git a/lib/standard/standard.nit b/lib/standard/standard.nit
index a1735c2..a0a4d6e 100644
--- a/lib/standard/standard.nit
+++ b/lib/standard/standard.nit
@@ -13,7 +13,7 @@
 
 # Standard classes and methods used by default by Nit programs and libraries.
 # This module is implicitly imported by every module.
-package standard
+module standard
 
 import posix
 import environ 
diff --git a/lib/standard/stream.nit b/lib/standard/stream.nit
index 806ecee..c4fe818 100644
--- a/lib/standard/stream.nit
+++ b/lib/standard/stream.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Input and output streams of characters
-package stream
+module stream
 
 import string
 
diff --git a/lib/standard/string.nit b/lib/standard/string.nit
index cfe5673..e600de1 100644
--- a/lib/standard/string.nit
+++ b/lib/standard/string.nit
@@ -12,7 +12,7 @@
 # another product.
 
 # Basic manipulations of strings of characters
-package string
+module string
 
 intrude import collection # FIXME should be collection::array
 import hash
diff --git a/lib/standard/string_search.nit b/lib/standard/string_search.nit
index 6aff1cd..46bda9b 100644
--- a/lib/standard/string_search.nit
+++ b/lib/standard/string_search.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Basic string search, match and replace.
-package string_search
+module string_search
 
 import string
 
diff --git a/lib/standard/time.nit b/lib/standard/time.nit
index df31613..97a4afd 100644
--- a/lib/standard/time.nit
+++ b/lib/standard/time.nit
@@ -11,7 +11,7 @@
 # another product.
 
 # Management of time and dates
-package time
+module time
 
 import string_search
 
diff --git a/lib/symbol.nit b/lib/symbol.nit
index d3a27ec..d268763 100644
--- a/lib/symbol.nit
+++ b/lib/symbol.nit
@@ -12,7 +12,7 @@
 
 # Symbol classes
 # FIXME: Should be deprecated soon
-package symbol
+module symbol
 
 redef class String
 	# Get the unique corresponding to the string
diff --git a/src/abstracttool.nit b/src/abstracttool.nit
index d76a3f8..779e03f 100644
--- a/src/abstracttool.nit
+++ b/src/abstracttool.nit
@@ -17,7 +17,7 @@
 
 
 # Base module for nit tools that load, manipulate or transform NIT models
-package abstracttool
+module abstracttool
 
 import mmloader
 import syntax
diff --git a/src/analysis/allocate_iregister_slots.nit b/src/analysis/allocate_iregister_slots.nit
index 78e2d3a..08ae41d 100644
--- a/src/analysis/allocate_iregister_slots.nit
+++ b/src/analysis/allocate_iregister_slots.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # iregisters slot allocation
-package allocate_iregister_slots
+module allocate_iregister_slots
 
 import icode
 private import primitive_info
diff --git a/src/analysis/analysis.nit b/src/analysis/analysis.nit
index 40abcff..fb68a59 100644
--- a/src/analysis/analysis.nit
+++ b/src/analysis/analysis.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Intermediate code local analysis and optimizations
-package analysis
+module analysis
 
 # Global imports
 import icode
diff --git a/src/analysis/icode_dump.nit b/src/analysis/icode_dump.nit
index 926a6fc..6696639 100644
--- a/src/analysis/icode_dump.nit
+++ b/src/analysis/icode_dump.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Output the intermediate code unded a textual representation
-package icode_dump
+module icode_dump
 
 import icode
 import allocate_iregister_slots
diff --git a/src/analysis/inline_methods.nit b/src/analysis/inline_methods.nit
index 483f877..7f0a027 100644
--- a/src/analysis/inline_methods.nit
+++ b/src/analysis/inline_methods.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Detect inlinable methods and inline them
-package inline_methods
+module inline_methods
 
 import icode
 
diff --git a/src/compiling/compiling.nit b/src/compiling/compiling.nit
index 429505b..ca6b943 100644
--- a/src/compiling/compiling.nit
+++ b/src/compiling/compiling.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Compute and generate tables for classes and modules.
-package compiling
+module compiling
 
 import table_computation
 import compiling_base
diff --git a/src/compiling/compiling_base.nit b/src/compiling/compiling_base.nit
index 4fdcec0..64289d4 100644
--- a/src/compiling/compiling_base.nit
+++ b/src/compiling/compiling_base.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Common things for NIT compilation and C generation
-package compiling_base
+module compiling_base
 
 import mmloader
 private import utils
diff --git a/src/compiling/compiling_global.nit b/src/compiling/compiling_global.nit
index 41bcbcb..39b31c4 100644
--- a/src/compiling/compiling_global.nit
+++ b/src/compiling/compiling_global.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Compute and generate tables for classes and modules.
-package compiling_global
+module compiling_global
 
 import table_computation
 private import compiling_icode
diff --git a/src/compiling/compiling_icode.nit b/src/compiling/compiling_icode.nit
index ccccb08..6287845 100644
--- a/src/compiling/compiling_icode.nit
+++ b/src/compiling/compiling_icode.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Generate C code from intermediate code representation
-package compiling_icode
+module compiling_icode
 
 import icode
 private import analysis
diff --git a/src/compiling/icode_generator.nit b/src/compiling/icode_generator.nit
index 2705b27..9d8a166 100644
--- a/src/compiling/icode_generator.nit
+++ b/src/compiling/icode_generator.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Generates ICode as an output format
-package icode_generator
+module icode_generator
 
 private import compiling_base
 import program
diff --git a/src/compiling/table_computation.nit b/src/compiling/table_computation.nit
index 6138e85..73e62cd 100644
--- a/src/compiling/table_computation.nit
+++ b/src/compiling/table_computation.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Compute tables for classes and modules.
-package table_computation
+module table_computation
 
 import mmloader
 private import primitive_info
diff --git a/src/compiling_writer.nit b/src/compiling_writer.nit
index 66ba50e..98e5cdc 100644
--- a/src/compiling_writer.nit
+++ b/src/compiling_writer.nit
@@ -16,7 +16,7 @@
 
 # Helps to generate complex strings.
 # Can be used to simplify complex file generation where text addition is not only done at the end
-package compiling_writer
+module compiling_writer
 
 # A writer is used to store a sequence of strings and sub-writers
 class Writer
diff --git a/src/git-gen-version.sh b/src/git-gen-version.sh
index e018dc6..946de52 100755
--- a/src/git-gen-version.sh
+++ b/src/git-gen-version.sh
@@ -25,7 +25,7 @@ gen_version() {
 	else
 		cat > nit_version.nit<<END
 # This file was generated by git-gen-version.sh
-package nit_version
+module nit_version
 fun nit_version: String do return "$*"
 END
 		echo "Version $*"
diff --git a/src/global/cha_analysis.nit b/src/global/cha_analysis.nit
index b14906c..4a1476a 100644
--- a/src/global/cha_analysis.nit
+++ b/src/global/cha_analysis.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This module implements Class Hierarchy Analysis (CHA)
-package cha_analysis
+module cha_analysis
 
 import reachable_method_analysis
 import icode
diff --git a/src/global/dead_method_removal.nit b/src/global/dead_method_removal.nit
index beb6a7c..4a48c93 100644
--- a/src/global/dead_method_removal.nit
+++ b/src/global/dead_method_removal.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This module introduces an algorithm to remove the body of dead methods
-package dead_method_removal
+module dead_method_removal
 
 import reachable_method_analysis
 
diff --git a/src/global/global.nit b/src/global/global.nit
index 351267b..ad7ec5c 100644
--- a/src/global/global.nit
+++ b/src/global/global.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Intermediate code global analysis and optimizations
-package global
+module global
 
 # Global imports
 import icode
diff --git a/src/global/inline_get_and_set.nit b/src/global/inline_get_and_set.nit
index 9f9ed78..a5512ed 100644
--- a/src/global/inline_get_and_set.nit
+++ b/src/global/inline_get_and_set.nit
@@ -16,7 +16,7 @@
 
 # Inline every automatic 'getters' and 'setters'
 # This optimization is done BEFORE analysis
-package inline_get_and_set
+module inline_get_and_set
 
 import icode
 private import syntax
diff --git a/src/global/instantiated_type_analysis.nit b/src/global/instantiated_type_analysis.nit
index d90bcce..ccdc673 100644
--- a/src/global/instantiated_type_analysis.nit
+++ b/src/global/instantiated_type_analysis.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Module containing all bases for instantiated type analysis
-package instantiated_type_analysis
+module instantiated_type_analysis
 
 import program
 
diff --git a/src/global/reachable_as_init.nit b/src/global/reachable_as_init.nit
index d6c0f4e..93a93d2 100644
--- a/src/global/reachable_as_init.nit
+++ b/src/global/reachable_as_init.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Module containing all bases for the reachable from init method analysis
-package reachable_as_init
+module reachable_as_init
 
 import icode
 import program
diff --git a/src/global/reachable_as_init_impl.nit b/src/global/reachable_as_init_impl.nit
index 22e9b32..a099204 100644
--- a/src/global/reachable_as_init_impl.nit
+++ b/src/global/reachable_as_init_impl.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This module introduces an analysis that flags all initializers called as new A.x
-package reachable_as_init_impl
+module reachable_as_init_impl
 
 import reachable_method_analysis
 import reachable_as_init
diff --git a/src/global/reachable_from_init_method_analysis.nit b/src/global/reachable_from_init_method_analysis.nit
index 4735012..bde61e8 100644
--- a/src/global/reachable_from_init_method_analysis.nit
+++ b/src/global/reachable_from_init_method_analysis.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Module containing all bases for the reachable from init method analysis
-package reachable_from_init_method_analysis
+module reachable_from_init_method_analysis
 
 import icode
 import program
diff --git a/src/global/reachable_from_init_method_analysis_impl.nit b/src/global/reachable_from_init_method_analysis_impl.nit
index 416185e..de3ffdd 100644
--- a/src/global/reachable_from_init_method_analysis_impl.nit
+++ b/src/global/reachable_from_init_method_analysis_impl.nit
@@ -16,7 +16,7 @@
 
 # This package introduces an algorithm to find all methods reachable
 # from at least one reachable initializer
-package reachable_from_init_method_analysis_impl
+module reachable_from_init_method_analysis_impl
 
 import reachable_from_init_method_analysis
 import reachable_method_analysis
diff --git a/src/global/reachable_method_analysis.nit b/src/global/reachable_method_analysis.nit
index bef70ff..d726501 100644
--- a/src/global/reachable_method_analysis.nit
+++ b/src/global/reachable_method_analysis.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Module containing all bases for the reachable method analysis
-package reachable_method_analysis
+module reachable_method_analysis
 
 import icode
 import program
diff --git a/src/global/remove_out_of_init_get_test.nit b/src/global/remove_out_of_init_get_test.nit
index 0685777..942edbb 100644
--- a/src/global/remove_out_of_init_get_test.nit
+++ b/src/global/remove_out_of_init_get_test.nit
@@ -16,7 +16,7 @@
 
 # This module introduces an optimization that removes 'get' tests when
 # not reachable from an initializer
-package remove_out_of_init_get_test
+module remove_out_of_init_get_test
 
 import reachable_from_init_method_analysis
 
diff --git a/src/global/rta_analysis.nit b/src/global/rta_analysis.nit
index e0883b1..4b2e030 100644
--- a/src/global/rta_analysis.nit
+++ b/src/global/rta_analysis.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This package implements Reachable Type Analysis(RTA)
-package rta_analysis
+module rta_analysis
 
 import instantiated_type_analysis
 import reachable_method_analysis
diff --git a/src/icode/icode_base.nit b/src/icode/icode_base.nit
index 496d399..a8bb691 100644
--- a/src/icode/icode_base.nit
+++ b/src/icode/icode_base.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Base classes for Nit intermediate code representation
-package icode_base
+module icode_base
 
 import metamodel
 
diff --git a/src/icode/icode_builder.nit b/src/icode/icode_builder.nit
index 7f37b75..003c187 100644
--- a/src/icode/icode_builder.nit
+++ b/src/icode/icode_builder.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Help generation of icode
-package icode_builder
+module icode_builder
 
 import icode_base
 
diff --git a/src/location.nit b/src/location.nit
index 26b6fa1..9b2dcd1 100644
--- a/src/location.nit
+++ b/src/location.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This module is used to model Nit source-file and locations in source-file
-package location
+module location
 
 # A raw text Nit source file
 class SourceFile
diff --git a/src/metamodel/abstractmetamodel.nit b/src/metamodel/abstractmetamodel.nit
index 37f9472..01fffc2 100644
--- a/src/metamodel/abstractmetamodel.nit
+++ b/src/metamodel/abstractmetamodel.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # core NIT metamodel classes featuring the minimal and simpliest entities
-package abstractmetamodel
+module abstractmetamodel
 
 import partial_order
 import location
diff --git a/src/metamodel/genericity.nit b/src/metamodel/genericity.nit
index ec27bb1..6c3b42d 100644
--- a/src/metamodel/genericity.nit
+++ b/src/metamodel/genericity.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Generic classes, generic types and generic formal parameters
-package genericity
+module genericity
 
 intrude import type_formal
 intrude import inheritance
diff --git a/src/metamodel/inheritance.nit b/src/metamodel/inheritance.nit
index 3cea0b3..ed5518f 100644
--- a/src/metamodel/inheritance.nit
+++ b/src/metamodel/inheritance.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Compute importation of classes and inheritance of properties
-package inheritance
+module inheritance
 
 intrude import static_type
 
diff --git a/src/metamodel/metamodel.nit b/src/metamodel/metamodel.nit
index 0a40341..bca090a 100644
--- a/src/metamodel/metamodel.nit
+++ b/src/metamodel/metamodel.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # NIT metamodel bottom module (aka metamodel featuring all extensions)
-package metamodel
+module metamodel
 
 import genericity
 import vararg
diff --git a/src/metamodel/partial_order.nit b/src/metamodel/partial_order.nit
index ff71f47..a151453 100644
--- a/src/metamodel/partial_order.nit
+++ b/src/metamodel/partial_order.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Partial ordered sets (ie hierarchies)
-package partial_order
+module partial_order
 
 # Handles partial ordered sets (ie hierarchies)
 # Thez are built by adding new element at the bottom of the hierarchy
diff --git a/src/metamodel/static_type.nit b/src/metamodel/static_type.nit
index 62033e4..d8725e5 100644
--- a/src/metamodel/static_type.nit
+++ b/src/metamodel/static_type.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Static types and property signatures
-package static_type
+module static_type
 
 intrude import abstractmetamodel
 
diff --git a/src/metamodel/type_formal.nit b/src/metamodel/type_formal.nit
index ca5edef..58fa335 100644
--- a/src/metamodel/type_formal.nit
+++ b/src/metamodel/type_formal.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Formal types
-package type_formal
+module type_formal
 
 import inheritance
 
diff --git a/src/metamodel/vararg.nit b/src/metamodel/vararg.nit
index c4e1c11..a141759 100644
--- a/src/metamodel/vararg.nit
+++ b/src/metamodel/vararg.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Handle multiple number of parameters in signatures
-package vararg
+module vararg
 
 import genericity
 
diff --git a/src/metamodel/virtualtype.nit b/src/metamodel/virtualtype.nit
index 323c37b..c8bad3a 100644
--- a/src/metamodel/virtualtype.nit
+++ b/src/metamodel/virtualtype.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Virtual type (property of type type)
-package virtualtype
+module virtualtype
 
 import type_formal
 
diff --git a/src/mmloader.nit b/src/mmloader.nit
index c59b30c..9e0b424 100644
--- a/src/mmloader.nit
+++ b/src/mmloader.nit
@@ -17,7 +17,7 @@
 # limitations under the License.
 
 # This module is used to load a metamodel
-package mmloader
+module mmloader
 
 import metamodel
 import opts
diff --git a/src/nitc.nit b/src/nitc.nit
index 6115520..06aeb71 100644
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Nit compiler main module
-package nitc
+module nitc
 
 import abstracttool
 import analysis
diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index bdaa346..f3823bf 100644
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # The main module of the nitdoc program
-package nitdoc
+module nitdoc
 
 import syntax
 private import utils
diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 92967d6..c8e64bf 100644
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -1,6 +1,6 @@
 # Lexer and its tokens.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package lexer
+module lexer
 
 intrude import parser_nodes
 private import tables
diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index 82c39f3..dd4ef9c 100644
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -1,6 +1,6 @@
 # Parser.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser
+module parser
 
 intrude import parser_prod
 import tables
diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index 6740a88..8e5771c 100644
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -1,6 +1,6 @@
 # Raw AST node hierarchy.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser_abs
+module parser_abs
 
 import location
 
diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 582be01..263169e 100644
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -14,7 +14,7 @@
 
 # AST nodes of the Nit language
 # Was previously based on parser_abs.nit.
-package parser_nodes
+module parser_nodes
 
 import location
 
diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit
index 9a70b38..20545ed 100644
--- a/src/parser/parser_prod.nit
+++ b/src/parser/parser_prod.nit
@@ -1,6 +1,6 @@
 # Production AST nodes full definition.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser_prod
+module parser_prod
 
 import lexer
 intrude import parser_nodes
diff --git a/src/parser/tables.nit b/src/parser/tables.nit
index c12d570..54b7b59 100644
--- a/src/parser/tables.nit
+++ b/src/parser/tables.nit
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Module that interfaces the parsing tables.
-package tables
+module tables
 
 # Interface allowing the acces of the tables used during the parsing.
 interface TablesCapable
diff --git a/src/parser/xss/main.xss b/src/parser/xss/main.xss
index ccf7c12..db69a01 100644
--- a/src/parser/xss/main.xss
+++ b/src/parser/xss/main.xss
@@ -23,7 +23,7 @@ $ include 'prods.xss'
 $ output 'parser_abs.nit'
 # Raw AST node hierarchy.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser_abs
+module parser_abs
 
 import location
 
@@ -34,7 +34,7 @@ $ end output
 $ output 'lexer.nit'
 # Lexer and its tokens.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package lexer
+module lexer
 
 $ if $usermodule
 intrude import $usermodule
@@ -49,7 +49,7 @@ $ end output
 $ output 'parser_prod.nit'
 # Production AST nodes full definition.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser_prod
+module parser_prod
 
 import lexer
 $ if $usermodule
@@ -65,7 +65,7 @@ $ end output
 $ output 'parser.nit'
 # Parser.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser
+module parser
 
 intrude import parser_prod
 import tables
diff --git a/src/primitive_info.nit b/src/primitive_info.nit
index 039cc88..00dd747 100644
--- a/src/primitive_info.nit
+++ b/src/primitive_info.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Common things for NIT compilation and C generation
-package primitive_info
+module primitive_info
 
 #FIXME Split this module into 2: one in metamodel and one in compiling
 
diff --git a/src/program.nit b/src/program.nit
index 728b7ce..f44a77a 100644
--- a/src/program.nit
+++ b/src/program.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Common things to represent a Nit program/library
-package program
+module program
 
 import metamodel
 import icode
diff --git a/src/simple_misc_analysis.nit b/src/simple_misc_analysis.nit
index dac8da7..634e1ce 100644
--- a/src/simple_misc_analysis.nit
+++ b/src/simple_misc_analysis.nit
@@ -19,7 +19,7 @@
 #  * superfluous parentheses
 #  * nested "once" expressions
 #  * use of "while true" instead of "loop"
-package simple_misc_analysis
+module simple_misc_analysis
 
 import toolcontext
 import parser
diff --git a/src/syntax/flow.nit b/src/syntax/flow.nit
index e4fbaef..e38dbe8 100644
--- a/src/syntax/flow.nit
+++ b/src/syntax/flow.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Analysis control flow and variable visibility in property bodies, statements and expressions
-package flow
+module flow
 
 import syntax_base
 
diff --git a/src/syntax/icode_generation.nit b/src/syntax/icode_generation.nit
index 1dcb563..f8a07e4 100644
--- a/src/syntax/icode_generation.nit
+++ b/src/syntax/icode_generation.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Things needed by typing.nit to generate intermediate code from AST
-package icode_generation
+module icode_generation
 
 import icode
 import syntax_base
diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index fd1d11d..2df1ad2 100644
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -17,7 +17,7 @@
 # Build MM entity from NIT AST and check conformance of these entities.
 # This module introduce specific MM class (MMSrcXXX) that specialize the abstract one from metamodel
 #
-package mmbuilder
+module mmbuilder
 
 import syntax_base
 private import primitive_info
diff --git a/src/syntax/scope.nit b/src/syntax/scope.nit
index 85140d0..dbda9e8 100644
--- a/src/syntax/scope.nit
+++ b/src/syntax/scope.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Manage nested escapable blocks (while, for and closure) and escape statements (break and continue)
-package scope
+module scope
 
 import syntax_base
 import flow
diff --git a/src/syntax/syntax.nit b/src/syntax/syntax.nit
index a17dc4a..2c65d15 100644
--- a/src/syntax/syntax.nit
+++ b/src/syntax/syntax.nit
@@ -16,7 +16,7 @@
 
 # Full syntax analysis of NIT AST.
 # Detect syntax and some metamodel errors.
-package syntax
+module syntax
 
 import mmloader
 import mmbuilder
diff --git a/src/syntax/syntax_base.nit b/src/syntax/syntax_base.nit
index a8d166d..fb2db7b 100644
--- a/src/syntax/syntax_base.nit
+++ b/src/syntax/syntax_base.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Common syntax structures for syntax analysis of NIT AST.
-package syntax_base
+module syntax_base
 
 import parser
 import mmloader
diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 18fc645..217d1cf 100644
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Analysis property bodies, statements and expressions
-package typing
+module typing
 
 import syntax_base
 import flow
diff --git a/src/test_parser.nit b/src/test_parser.nit
index 654e9cd..91851ba 100644
--- a/src/test_parser.nit
+++ b/src/test_parser.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Program used to test the NIT parser
-package test_parser
+module test_parser
 
 import parser
 
diff --git a/src/toolcontext.nit b/src/toolcontext.nit
index 5cdea5d..e614565 100644
--- a/src/toolcontext.nit
+++ b/src/toolcontext.nit
@@ -17,7 +17,7 @@
 # limitations under the License.
 
 # Common command-line tool infractructure than handle options and error messages
-package toolcontext
+module toolcontext
 
 import opts
 import location
diff --git a/src/utils.nit b/src/utils.nit
index 2787b22..df2e9f5 100644
--- a/src/utils.nit
+++ b/src/utils.nit
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # Various functions for NIT tools
-package utils
+module utils
 
 import symbol
 
diff --git a/tests/sav/test_parser_args1.res b/tests/sav/test_parser_args1.res
index d558930..ea32fbf 100644
--- a/tests/sav/test_parser_args1.res
+++ b/tests/sav/test_parser_args1.res
@@ -1,11 +1,11 @@
 Start ../src/test_parser.nit:17,1--110,1
   AModule ../src/test_parser.nit:17,1--109,3
-    AModuledecl ../src/test_parser.nit:17,1--18,19
+    AModuledecl ../src/test_parser.nit:17,1--18,18
       ADoc ../src/test_parser.nit:17,1--18,0
         TComment "# Program used to test the NIT parser\n" ../src/test_parser.nit:17,1--18,0
-      TKwmodule "package" ../src/test_parser.nit:18,1--7
-      AModuleName ../src/test_parser.nit:18,9--19
-        TId "test_parser" ../src/test_parser.nit:18,9--19
+      TKwmodule "module" ../src/test_parser.nit:18,1--6
+      AModuleName ../src/test_parser.nit:18,8--18
+        TId "test_parser" ../src/test_parser.nit:18,8--18
     AStdImport ../src/test_parser.nit:20,1--13
       APublicVisibility ../src/test_parser.nit:20,1
       TKwimport "import" ../src/test_parser.nit:20,1--6
diff --git a/tests/sav/test_parser_args2.res b/tests/sav/test_parser_args2.res
index bcc41f3..af40e9f 100644
--- a/tests/sav/test_parser_args2.res
+++ b/tests/sav/test_parser_args2.res
@@ -32,9 +32,9 @@ Read token at ../src/test_parser.nit:16,1--17,0 text='
 '
 Read token at ../src/test_parser.nit:17,1--18,0 text='# Program used to test the NIT parser
 '
-Read token at ../src/test_parser.nit:18,1--7 text='package'
-Read token at ../src/test_parser.nit:18,9--19 text='test_parser'
-Read token at ../src/test_parser.nit:18,20--19,0 text='
+Read token at ../src/test_parser.nit:18,1--6 text='module'
+Read token at ../src/test_parser.nit:18,8--18 text='test_parser'
+Read token at ../src/test_parser.nit:18,19--19,0 text='
 '
 Read token at ../src/test_parser.nit:19,1--20,0 text='
 '
-- 
1.7.9.5