Packages and module names changes