Thanks for making it really clear. I totally know which one to turn on when I am trying to find some midnight snack in the kitchen.
This is a common problem among any button-involved product design no matter if it is in our tangible world or intangible world. We like consistency but we don’t like consistency that creates confusion.
When users add more stuff to the original design, there is urgent need for further improvement and we should not ignore that.