converting to consistently use architecture that works for both platform and arch