omg yes. this needs to become the gospel. by renaming you lose "branding" that you quickly regain, and don't affect compatibility at all.

if you step back and think about it, using the same word for two fundamentally irreconcilable things is mad.