Updated more package names