'Added triming for package names'