To clear up the dropping "Xbox One" part I've expanded a little.
"MS will drop the Xbox One Name on it's own (Edit: To clear this up I don't think they drop the Xbox One itself but start to phase out the Xbox One name and support the Xbox One for the next few year. The new box could be something like "Windows Xbox One". The following updated models could be something like "Windows Xbox One -add a word here-" Over time they will drop the "One" from the name as the transition fully to PC and drop support for Xbox One. Instead)"