Didn’t the Welsh refer to themselves as “Cymry” or “Cymric” before then?
Yes, I think uou are right. BTW, North Wales was the last part of the Western Roman Empire to fall to Germanic invaders. By this I mean the Anglo-Saxon army of Edward I.