Don't switch Total Control Buttons

I play EASHL 6s or 3s only on a competitive level. I loved the implementation of the passing buttons last year, but what I don't understand until today is, why they are not staying with the player instead of belonging to the position. Every time we had a penalty kill, the button are totally mixed up and useless in a quick situation. Isn't it possible to just keep the buttons on the player? 

For example as a C"

The RW (blue) is always O

LW (green) always Square

LD always X

RD always triangle

Especially with cutting the colour this year, it's almost impossible to adjust quick enougj to the new button after or while a penalty kill.