I'd say it is OK to use X200 as a generic code, like we do for the Toyota codes where the last digit also depends on details we don't always know.
I'll already apply the XJ3 to the old ones.