I don't think I'd be as upset with all these name drops if WWE would just call him by "Riddle" 90% of the time but let "Matt" slip in like how Batista would still be called "Dave Batista" throughout his entire career, just not super often. It's like Vince doesn't realize names can be said short...