fix package and subpackage namings