ZA swap NA and NCOP images, closes #1043