Updated 1008 packages to metric 2520 naming