Tidying up package names
Tidying up package names