Guji were not originally Oromo, but their neighbors and cousins, their homeland is Girja to the southwest of Mada Walabu. Warra Dayyo were not originally Oromo either, but a related tribe who lived in Liban immediately south of the Mada Walabu.
This is kind of a matter of semantics really. By Oromo I mean from Mada Walabu and of either the Barentuma or Borana confederations, but Oromo also just means "the people" or "humanity" in many east Cushitic languages and Warday refer to themselves as Orma ("the people").
Listen, these 2 clans are Oromo.
It was at Mada Walabu were the Oromo clan elders decided they would become 2 confederations, Borana and Barentumma. Those who moved and migrated earlier where the warra Dayyu and Munjo who are today Orma.
The rest have become Barentu or Borana. You will find overlaps in all clans. There are Nooles, Jarso, Metta etc in every region. These clans I believe were once one large unit but went different ways.
The subclans of Orma are all Oromo clans. Can you tell me who they are if not Oromo? They aren’t their own ethnic group, and never have been.