Codegen tweaks - package name change.