The real question is whether they intend to have Xbox one S just change to the Xbox one line and remove OG from the picture entirely.
If that happens the naming possibilities open up a bit more.
With everything becoming 4K playback in their line up, they can replace the "one", and Scorpio becomes the ultra/ edition of it.
Gun to my head:
SCORPIO- Xbox One XS
Xbox One S - Xbox One
OG XBO - Xbox One Classic