more package name fixing