Enh: rename the module name into the package one
Enh: rename the module name into the package one