rename the array consistently, again