Fix regex for package name parsing
Fix typoy