Fix avoiding duplicate correlation name definition