change order so windows get named correctly