Fixing to the correct package names