Update Android iOS/Mac and Store/Phone to use alternate view naming