Convolution.cpp code cleanups, e.g. rename some variables to match sclang code