x86: avoid underscore in package name