I just want to make a comment.
I think bringing some consistency to this is very important. If someone is reading it and its definition is different but it means the same thing, then why is the definition not consistent?
As for the definitions, I would say that bringing some consistency to them is the best approach, along with bringing more focus and more light and discussion to this. Really, it's the question of bringing some consistency around it by having the same wording for the three holidays.