Yes, he switched from titling his concept X-Men to avoid that confusion and to make it clear that the X-Men themselves are not being played yet. That being said, the timeline he set forth for the X-Men as part of his concept is now canon. That mainly being the X-Men recently formed as a team within the last year or so.