Fix package names