Update to how package sub-generator names package.