package name fixups