COAP-22 inner loop variable rename