Changed convolve 1d function names to be more precise. Change-Id: I9bc1e99f5032ed8a84c61616036735af23d9a587