My master and I have been in a relationship for six years before we started into real BDSM (we always had bondage and pain but only recently started with power exchange). We are having troubles determining when it's "game on." I told Sir that I don't mind being submissive all the time but, I have issues of falling back into some of our old relationship habits. We have incorporated terms to speak so that I know when I'm getting an order and when he's just asking (even in polite company).
Does anyone have any suggestions of how to switch into my sub mindset when I get home? I have recently started changing into my uniform or getting naked when I get home to remind myself. Any advice would be appreciated.

Thank you!