Include architecture within package name