Remove architecture from generated package name