Fix package names

This reverts commit d4847f38f32a550ddd1f0357a0437dcb7cf84cb7.