To me, readability is more important than subtle semantic aspects. I think it is better if you correct these names.