I don't use the two terms interchangeably for just the reasons you outlined.
I see TPE as something used exclusively for those who embrace Master/Mistress and slave relationships. Most D/s relationships, with a Dominant and submissive don't involved total power exchanges. They can be full-time, so those would be 24/7.