Tidy up of package names