The standard way. The same way you define “Thailand” or “Bangladesh” or “Vietnam?”
It seems like "Japan" will very much still exist in either of your scenarios then.