I think it's unfortunately time to also retire to old_name the old descriptive PC names (e.g. de la rivière xy) that the 2019/12/20 law removed. Sad choice by PCh but long term it will prevent referencing conflicts here.
I will take care of it with JOSM.