Fix package names.

The category directory name was included in there by accident. This also
fixes the generating script.