That's what I'm thinking they're going for. Once again just making it Macbook and MacBook Pro
Just get rid of all current macbooks and start again.
Macbook 11, 13, 15, 17 all with retina displays.
At first I thought Apple would just drop the secondary branding and make them all just MacBook (like the iMac line). If they went that route, then the base models would have to be pretty modest in terms of specs with the option to outfit them with better specs. But that might get confusing, so I agree that they may be going back to having two lines; MacBook and MacBook Pro.