fixed naming of packages