I just don't think it's that simple. When designing the trailer, if the idea was to create a mini-cliffhanger so to speak, then why would they make it that obvious?
I honestly think it refers to young Xehanort. They're probably shocked that Terra's now referring to himself as Xehanort.
Since when Terra referred himself as Xehanort please explian?