r1009: Move the dependencies to newer package names