Avoid future window id conflicts

I preserved the old window ids as hint, so we can have 2 windows with
same id if needed, hints can be removed if there are no plans to use
them.