Uribe and Santos clash over conflict terminology