From 2c20ae54f98dea3c6db453c2d3a336a18c438405 Mon Sep 17 00:00:00 2001
From: Albert Yosher <ayosher@qti.qualcomm.com>
Date: Sun, 13 Oct 2024 16:03:07 +0300
Subject: [PATCH] Add Xqciu v0.3, renamed it to Xqci, renamed instructions to
 comply with toolchain conventions

Signed-off-by: Albert Yosher <ayosher@qti.qualcomm.com>
---
 backends/arch_gen/lib/arch_gen.rb             |  5 +-
 .../ext_pdf_doc/templates/ext_pdf.adoc.erb    | 14 +++-
 .../csr/{Xqciu => Xqci}/gen_mcliciX.rb        | 16 ++---
 .../mclicie0.yaml => Xqci/qc.mclicie0.yaml}   | 66 +++++++++----------
 .../mclicie1.yaml => Xqci/qc.mclicie1.yaml}   | 66 +++++++++----------
 .../mclicie2.yaml => Xqci/qc.mclicie2.yaml}   | 66 +++++++++----------
 .../mclicie3.yaml => Xqci/qc.mclicie3.yaml}   | 66 +++++++++----------
 .../mclicie4.yaml => Xqci/qc.mclicie4.yaml}   | 66 +++++++++----------
 .../mclicie5.yaml => Xqci/qc.mclicie5.yaml}   | 66 +++++++++----------
 .../mclicie6.yaml => Xqci/qc.mclicie6.yaml}   | 66 +++++++++----------
 .../mclicie7.yaml => Xqci/qc.mclicie7.yaml}   | 66 +++++++++----------
 .../mclicip0.yaml => Xqci/qc.mclicip0.yaml}   | 66 +++++++++----------
 .../mclicip1.yaml => Xqci/qc.mclicip1.yaml}   | 66 +++++++++----------
 .../mclicip2.yaml => Xqci/qc.mclicip2.yaml}   | 66 +++++++++----------
 .../mclicip3.yaml => Xqci/qc.mclicip3.yaml}   | 66 +++++++++----------
 .../mclicip4.yaml => Xqci/qc.mclicip4.yaml}   | 66 +++++++++----------
 .../mclicip5.yaml => Xqci/qc.mclicip5.yaml}   | 66 +++++++++----------
 .../mclicip6.yaml => Xqci/qc.mclicip6.yaml}   | 66 +++++++++----------
 .../mclicip7.yaml => Xqci/qc.mclicip7.yaml}   | 66 +++++++++----------
 .../ext/{Xqciu.yaml => Xqci.yaml}             | 62 ++++++++++-------
 cfgs/qc_iu/arch_overlay/ext/Xqcia.yaml        | 27 ++++++++
 .../ext/{Xqcac.yaml => Xqciac.yaml}           |  6 +-
 cfgs/qc_iu/arch_overlay/ext/Xqcibi.yaml       | 31 +++++++++
 .../ext/{Xqcbm.yaml => Xqcibm.yaml}           |  6 +-
 .../ext/{Xqccli.yaml => Xqcicli.yaml}         |  4 +-
 .../ext/{Xqccm.yaml => Xqcicm.yaml}           |  6 +-
 .../ext/{Xqccs.yaml => Xqcics.yaml}           |  4 +-
 .../ext/{Xqcbi.yaml => Xqcicsr.yaml}          |  9 ++-
 .../ext/{Xqcint.yaml => Xqciint.yaml}         |  6 +-
 cfgs/qc_iu/arch_overlay/ext/Xqcilb.yaml       | 27 ++++++++
 .../ext/{Xqcli.yaml => Xqcili.yaml}           |  4 +-
 .../ext/{Xqclia.yaml => Xqcilia.yaml}         |  4 +-
 .../ext/{Xqclo.yaml => Xqcilo.yaml}           |  4 +-
 .../ext/{Xqclsm.yaml => Xqcilsm.yaml}         |  4 +-
 cfgs/qc_iu/arch_overlay/ext/Xqcisls.yaml      | 27 ++++++++
 .../qc32.addsat.yaml => Xqci/qc.addsat.yaml}  |  6 +-
 .../qc.addusat.yaml}                          |  6 +-
 .../qc32.beqi.yaml => Xqci/qc.beqi.yaml}      |  6 +-
 .../qc32.bgei.yaml => Xqci/qc.bgei.yaml}      |  6 +-
 .../qc32.bgeui.yaml => Xqci/qc.bgeui.yaml}    |  6 +-
 .../qc32.blti.yaml => Xqci/qc.blti.yaml}      |  6 +-
 .../qc32.bltui.yaml => Xqci/qc.bltui.yaml}    |  6 +-
 .../qc32.bnei.yaml => Xqci/qc.bnei.yaml}      |  6 +-
 .../qc32.brev32.yaml => Xqci/qc.brev32.yaml}  |  6 +-
 .../qc16.bexti.yaml => Xqci/qc.c.bexti.yaml}  |  6 +-
 .../qc16.bseti.yaml => Xqci/qc.c.bseti.yaml}  |  6 +-
 .../qc.c.clrint.yaml}                         |  6 +-
 .../qc16.delay.yaml => Xqci/qc.c.delay.yaml}  |  4 +-
 .../{Xqciu/qc16.di.yaml => Xqci/qc.c.di.yaml} |  6 +-
 .../qc16.dir.yaml => Xqci/qc.c.dir.yaml}      |  6 +-
 .../{Xqciu/qc16.ei.yaml => Xqci/qc.c.ei.yaml} |  6 +-
 .../qc16.eir.yaml => Xqci/qc.c.eir.yaml}      |  6 +-
 .../qc16.extu.yaml => Xqci/qc.c.extu.yaml}    |  6 +-
 .../qc.c.mienter.nest.yaml}                   |  6 +-
 .../qc.c.mienter.yaml}                        |  6 +-
 .../qc.c.mileaveret.yaml}                     |  6 +-
 .../qc16.mnret.yaml => Xqci/qc.c.mnret.yaml}  |  4 +-
 .../qc16.mret.yaml => Xqci/qc.c.mret.yaml}    |  4 +-
 .../qc.c.muladdi.yaml}                        |  6 +-
 .../qc16.mveqz.yaml => Xqci/qc.c.mveqz.yaml}  |  6 +-
 .../qc.c.setint.yaml}                         |  6 +-
 .../{Xqciu/qc32.clo.yaml => Xqci/qc.clo.yaml} |  6 +-
 .../qc.clrinti.yaml}                          |  6 +-
 .../qc.compress2.yaml}                        |  6 +-
 .../qc.compress3.yaml}                        | 10 +--
 .../qc32.csrrwr.yaml => Xqci/qc.csrrwr.yaml}  |  8 ++-
 .../qc.csrrwri.yaml}                          |  6 +-
 .../{Xqciu/qc32.cto.yaml => Xqci/qc.cto.yaml} |  6 +-
 .../qc48.addai.yaml => Xqci/qc.e.addai.yaml}  |  6 +-
 .../qc48.addi.yaml => Xqci/qc.e.addi.yaml}    |  6 +-
 .../qc48.andai.yaml => Xqci/qc.e.andai.yaml}  |  6 +-
 .../qc48.andi.yaml => Xqci/qc.e.andi.yaml}    |  6 +-
 .../qc48.beqi.yaml => Xqci/qc.e.beqi.yaml}    |  6 +-
 .../qc48.bgei.yaml => Xqci/qc.e.bgei.yaml}    |  6 +-
 .../qc48.bgeui.yaml => Xqci/qc.e.bgeui.yaml}  |  6 +-
 .../qc48.blti.yaml => Xqci/qc.e.blti.yaml}    |  6 +-
 .../qc48.bltui.yaml => Xqci/qc.e.bltui.yaml}  |  6 +-
 .../qc48.bnei.yaml => Xqci/qc.e.bnei.yaml}    |  6 +-
 .../{Xqciu/qc48.j.yaml => Xqci/qc.e.j.yaml}   |  6 +-
 .../qc48.jal.yaml => Xqci/qc.e.jal.yaml}      |  6 +-
 .../{Xqciu/qc48.lb.yaml => Xqci/qc.e.lb.yaml} |  6 +-
 .../qc48.lbu.yaml => Xqci/qc.e.lbu.yaml}      |  6 +-
 .../{Xqciu/qc48.lh.yaml => Xqci/qc.e.lh.yaml} |  6 +-
 .../qc48.lhu.yaml => Xqci/qc.e.lhu.yaml}      |  6 +-
 .../{Xqciu/qc48.li.yaml => Xqci/qc.e.li.yaml} |  6 +-
 .../{Xqciu/qc48.lw.yaml => Xqci/qc.e.lw.yaml} |  6 +-
 .../qc48.orai.yaml => Xqci/qc.e.orai.yaml}    |  6 +-
 .../qc48.ori.yaml => Xqci/qc.e.ori.yaml}      |  6 +-
 .../{Xqciu/qc48.sb.yaml => Xqci/qc.e.sb.yaml} |  6 +-
 .../{Xqciu/qc48.sh.yaml => Xqci/qc.e.sh.yaml} |  6 +-
 .../{Xqciu/qc48.sw.yaml => Xqci/qc.e.sw.yaml} |  6 +-
 .../qc48.xorai.yaml => Xqci/qc.e.xorai.yaml}  |  6 +-
 .../qc48.xori.yaml => Xqci/qc.e.xori.yaml}    |  6 +-
 .../qc.expand2.yaml}                          |  6 +-
 .../qc.expand3.yaml}                          | 10 +--
 .../qc32.exts.yaml => Xqci/qc.ext.yaml}       |  6 +-
 .../qc32.extds.yaml => Xqci/qc.extd.yaml}     |  6 +-
 .../qc32.extdspr.yaml => Xqci/qc.extdpr.yaml} |  6 +-
 .../qc.extdprh.yaml}                          |  6 +-
 .../qc32.extdsr.yaml => Xqci/qc.extdr.yaml}   |  6 +-
 .../qc32.extdu.yaml => Xqci/qc.extdu.yaml}    |  6 +-
 .../qc.extdupr.yaml}                          |  6 +-
 .../qc.extduprh.yaml}                         |  6 +-
 .../qc32.extdur.yaml => Xqci/qc.extdur.yaml}  |  6 +-
 .../qc32.extu.yaml => Xqci/qc.extu.yaml}      |  6 +-
 .../qc32.insb.yaml => Xqci/qc.insb.yaml}      |  6 +-
 .../qc32.insbh.yaml => Xqci/qc.insbh.yaml}    |  6 +-
 .../qc32.insbhr.yaml => Xqci/qc.insbhr.yaml}  |  6 +-
 .../qc32.insbi.yaml => Xqci/qc.insbi.yaml}    |  6 +-
 .../qc32.insbpr.yaml => Xqci/qc.insbpr.yaml}  |  6 +-
 .../qc.insbprh.yaml}                          |  6 +-
 .../qc32.insbr.yaml => Xqci/qc.insbr.yaml}    |  6 +-
 .../qc32.insbri.yaml => Xqci/qc.insbri.yaml}  |  6 +-
 .../{Xqciu/qc32.li.yaml => Xqci/qc.li.yaml}   |  6 +-
 .../qc32.lieq.yaml => Xqci/qc.lieq.yaml}      |  6 +-
 .../qc32.lieqi.yaml => Xqci/qc.lieqi.yaml}    |  6 +-
 .../qc32.lige.yaml => Xqci/qc.lige.yaml}      |  6 +-
 .../qc32.ligei.yaml => Xqci/qc.ligei.yaml}    |  6 +-
 .../qc32.ligeu.yaml => Xqci/qc.ligeu.yaml}    |  6 +-
 .../qc32.ligeui.yaml => Xqci/qc.ligeui.yaml}  |  6 +-
 .../qc32.lilt.yaml => Xqci/qc.lilt.yaml}      |  6 +-
 .../qc32.lilti.yaml => Xqci/qc.lilti.yaml}    |  6 +-
 .../qc32.liltu.yaml => Xqci/qc.liltu.yaml}    |  6 +-
 .../qc32.liltui.yaml => Xqci/qc.liltui.yaml}  |  6 +-
 .../qc32.line.yaml => Xqci/qc.line.yaml}      |  6 +-
 .../qc32.linei.yaml => Xqci/qc.linei.yaml}    |  6 +-
 .../{Xqciu/qc32.lrb.yaml => Xqci/qc.lrb.yaml} |  6 +-
 .../qc32.lrbu.yaml => Xqci/qc.lrbu.yaml}      |  6 +-
 .../{Xqciu/qc32.lrh.yaml => Xqci/qc.lrh.yaml} |  6 +-
 .../qc32.lrhu.yaml => Xqci/qc.lrhu.yaml}      |  6 +-
 .../{Xqciu/qc32.lrw.yaml => Xqci/qc.lrw.yaml} | 10 +--
 .../{Xqciu/qc32.lwm.yaml => Xqci/qc.lwm.yaml} |  6 +-
 .../qc32.lwmi.yaml => Xqci/qc.lwmi.yaml}      |  6 +-
 .../qc.muladdi.yaml}                          |  6 +-
 .../qc32.mveq.yaml => Xqci/qc.mveq.yaml}      |  6 +-
 .../qc32.mveqi.yaml => Xqci/qc.mveqi.yaml}    |  6 +-
 .../qc32.mvge.yaml => Xqci/qc.mvge.yaml}      |  6 +-
 .../qc32.mvgei.yaml => Xqci/qc.mvgei.yaml}    |  6 +-
 .../qc32.mvgeu.yaml => Xqci/qc.mvgeu.yaml}    |  6 +-
 .../qc32.mvgeui.yaml => Xqci/qc.mvgeui.yaml}  |  6 +-
 .../qc32.mvlt.yaml => Xqci/qc.mvlt.yaml}      |  6 +-
 .../qc32.mvlti.yaml => Xqci/qc.mvlti.yaml}    |  6 +-
 .../qc32.mvltu.yaml => Xqci/qc.mvltu.yaml}    |  6 +-
 .../qc32.mvltui.yaml => Xqci/qc.mvltui.yaml}  |  6 +-
 .../qc32.mvne.yaml => Xqci/qc.mvne.yaml}      |  6 +-
 .../qc32.mvnei.yaml => Xqci/qc.mvnei.yaml}    |  6 +-
 .../qc32.norm.yaml => Xqci/qc.norm.yaml}      |  6 +-
 .../qc32.normeu.yaml => Xqci/qc.normeu.yaml}  |  6 +-
 .../qc32.normu.yaml => Xqci/qc.normu.yaml}    |  6 +-
 .../qc.selecteqi.yaml}                        |  6 +-
 .../qc.selectieq.yaml}                        |  6 +-
 .../qc.selectieqi.yaml}                       |  6 +-
 .../qc.selectiieq.yaml}                       |  6 +-
 .../qc.selectiine.yaml}                       |  6 +-
 .../qc.selectine.yaml}                        |  6 +-
 .../qc.selectinei.yaml}                       |  6 +-
 .../qc.selectnei.yaml}                        |  6 +-
 .../qc.setinti.yaml}                          |  6 +-
 .../qc32.setwm.yaml => Xqci/qc.setwm.yaml}    |  6 +-
 .../qc32.setwmi.yaml => Xqci/qc.setwmi.yaml}  |  6 +-
 .../qc32.shladd.yaml => Xqci/qc.shladd.yaml}  |  6 +-
 .../qc32.slasat.yaml => Xqci/qc.slasat.yaml}  |  6 +-
 .../qc32.sllsat.yaml => Xqci/qc.sllsat.yaml}  |  6 +-
 .../{Xqciu/qc32.srb.yaml => Xqci/qc.srb.yaml} |  6 +-
 .../{Xqciu/qc32.srh.yaml => Xqci/qc.srh.yaml} |  6 +-
 .../{Xqciu/qc32.srw.yaml => Xqci/qc.srw.yaml} |  6 +-
 .../qc32.subsat.yaml => Xqci/qc.subsat.yaml}  |  6 +-
 .../qc.subusat.yaml}                          |  6 +-
 .../{Xqciu/qc32.swm.yaml => Xqci/qc.swm.yaml} |  6 +-
 .../qc32.swmi.yaml => Xqci/qc.swmi.yaml}      |  6 +-
 .../qc32.wrap.yaml => Xqci/qc.wrap.yaml}      |  6 +-
 .../qc32.wrapi.yaml => Xqci/qc.wrapi.yaml}    |  6 +-
 .../arch_overlay/inst/Xqciu/qc32.sh4add.yaml  | 29 --------
 .../arch_overlay/inst/Xqciu/qc32.sh5add.yaml  | 29 --------
 .../arch_overlay/inst/Xqciu/qc32.sh6add.yaml  | 29 --------
 .../arch_overlay/inst/Xqciu/qc32.sh7add.yaml  | 29 --------
 .../arch_overlay/inst/Xqciu/qc32.sh8add.yaml  | 29 --------
 schemas/arch_schema.json                      |  2 +-
 schemas/csr_schema.json                       |  2 +-
 179 files changed, 1201 insertions(+), 1100 deletions(-)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu => Xqci}/gen_mcliciX.rb (77%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie0.yaml => Xqci/qc.mclicie0.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie1.yaml => Xqci/qc.mclicie1.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie2.yaml => Xqci/qc.mclicie2.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie3.yaml => Xqci/qc.mclicie3.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie4.yaml => Xqci/qc.mclicie4.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie5.yaml => Xqci/qc.mclicie5.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie6.yaml => Xqci/qc.mclicie6.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicie7.yaml => Xqci/qc.mclicie7.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip0.yaml => Xqci/qc.mclicip0.yaml} (69%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip1.yaml => Xqci/qc.mclicip1.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip2.yaml => Xqci/qc.mclicip2.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip3.yaml => Xqci/qc.mclicip3.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip4.yaml => Xqci/qc.mclicip4.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip5.yaml => Xqci/qc.mclicip5.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip6.yaml => Xqci/qc.mclicip6.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/csr/{Xqciu/mclicip7.yaml => Xqci/qc.mclicip7.yaml} (68%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqciu.yaml => Xqci.yaml} (61%)
 create mode 100644 cfgs/qc_iu/arch_overlay/ext/Xqcia.yaml
 rename cfgs/qc_iu/arch_overlay/ext/{Xqcac.yaml => Xqciac.yaml} (89%)
 create mode 100644 cfgs/qc_iu/arch_overlay/ext/Xqcibi.yaml
 rename cfgs/qc_iu/arch_overlay/ext/{Xqcbm.yaml => Xqcibm.yaml} (87%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqccli.yaml => Xqcicli.yaml} (89%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqccm.yaml => Xqcicm.yaml} (88%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqccs.yaml => Xqcics.yaml} (89%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqcbi.yaml => Xqcicsr.yaml} (78%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqcint.yaml => Xqciint.yaml} (89%)
 create mode 100644 cfgs/qc_iu/arch_overlay/ext/Xqcilb.yaml
 rename cfgs/qc_iu/arch_overlay/ext/{Xqcli.yaml => Xqcili.yaml} (86%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqclia.yaml => Xqcilia.yaml} (87%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqclo.yaml => Xqcilo.yaml} (88%)
 rename cfgs/qc_iu/arch_overlay/ext/{Xqclsm.yaml => Xqcilsm.yaml} (88%)
 create mode 100644 cfgs/qc_iu/arch_overlay/ext/Xqcisls.yaml
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.addsat.yaml => Xqci/qc.addsat.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.addusat.yaml => Xqci/qc.addusat.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.beqi.yaml => Xqci/qc.beqi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.bgei.yaml => Xqci/qc.bgei.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.bgeui.yaml => Xqci/qc.bgeui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.blti.yaml => Xqci/qc.blti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.bltui.yaml => Xqci/qc.bltui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.bnei.yaml => Xqci/qc.bnei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.brev32.yaml => Xqci/qc.brev32.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.bexti.yaml => Xqci/qc.c.bexti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.bseti.yaml => Xqci/qc.c.bseti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.clrint.yaml => Xqci/qc.c.clrint.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.delay.yaml => Xqci/qc.c.delay.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.di.yaml => Xqci/qc.c.di.yaml} (91%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.dir.yaml => Xqci/qc.c.dir.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.ei.yaml => Xqci/qc.c.ei.yaml} (91%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.eir.yaml => Xqci/qc.c.eir.yaml} (91%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.extu.yaml => Xqci/qc.c.extu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mienter.nest.yaml => Xqci/qc.c.mienter.nest.yaml} (97%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mienter.yaml => Xqci/qc.c.mienter.yaml} (98%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mileaveret.yaml => Xqci/qc.c.mileaveret.yaml} (97%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mnret.yaml => Xqci/qc.c.mnret.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mret.yaml => Xqci/qc.c.mret.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mpyaddi.yaml => Xqci/qc.c.muladdi.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.mveqz.yaml => Xqci/qc.c.mveqz.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc16.setint.yaml => Xqci/qc.c.setint.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.clo.yaml => Xqci/qc.clo.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.clrinti.yaml => Xqci/qc.clrinti.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.compress2.yaml => Xqci/qc.compress2.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.compress3.yaml => Xqci/qc.compress3.yaml} (79%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.csrrwr.yaml => Xqci/qc.csrrwr.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.csrrwri.yaml => Xqci/qc.csrrwri.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.cto.yaml => Xqci/qc.cto.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.addai.yaml => Xqci/qc.e.addai.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.addi.yaml => Xqci/qc.e.addi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.andai.yaml => Xqci/qc.e.andai.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.andi.yaml => Xqci/qc.e.andi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.beqi.yaml => Xqci/qc.e.beqi.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.bgei.yaml => Xqci/qc.e.bgei.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.bgeui.yaml => Xqci/qc.e.bgeui.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.blti.yaml => Xqci/qc.e.blti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.bltui.yaml => Xqci/qc.e.bltui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.bnei.yaml => Xqci/qc.e.bnei.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.j.yaml => Xqci/qc.e.j.yaml} (92%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.jal.yaml => Xqci/qc.e.jal.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.lb.yaml => Xqci/qc.e.lb.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.lbu.yaml => Xqci/qc.e.lbu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.lh.yaml => Xqci/qc.e.lh.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.lhu.yaml => Xqci/qc.e.lhu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.li.yaml => Xqci/qc.e.li.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.lw.yaml => Xqci/qc.e.lw.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.orai.yaml => Xqci/qc.e.orai.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.ori.yaml => Xqci/qc.e.ori.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.sb.yaml => Xqci/qc.e.sb.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.sh.yaml => Xqci/qc.e.sh.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.sw.yaml => Xqci/qc.e.sw.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.xorai.yaml => Xqci/qc.e.xorai.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc48.xori.yaml => Xqci/qc.e.xori.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.expand2.yaml => Xqci/qc.expand2.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.expand3.yaml => Xqci/qc.expand3.yaml} (85%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.exts.yaml => Xqci/qc.ext.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extds.yaml => Xqci/qc.extd.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdspr.yaml => Xqci/qc.extdpr.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdsprh.yaml => Xqci/qc.extdprh.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdsr.yaml => Xqci/qc.extdr.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdu.yaml => Xqci/qc.extdu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdupr.yaml => Xqci/qc.extdupr.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extduprh.yaml => Xqci/qc.extduprh.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extdur.yaml => Xqci/qc.extdur.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.extu.yaml => Xqci/qc.extu.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insb.yaml => Xqci/qc.insb.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbh.yaml => Xqci/qc.insbh.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbhr.yaml => Xqci/qc.insbhr.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbi.yaml => Xqci/qc.insbi.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbpr.yaml => Xqci/qc.insbpr.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbprh.yaml => Xqci/qc.insbprh.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbr.yaml => Xqci/qc.insbr.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.insbri.yaml => Xqci/qc.insbri.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.li.yaml => Xqci/qc.li.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lieq.yaml => Xqci/qc.lieq.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lieqi.yaml => Xqci/qc.lieqi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lige.yaml => Xqci/qc.lige.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.ligei.yaml => Xqci/qc.ligei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.ligeu.yaml => Xqci/qc.ligeu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.ligeui.yaml => Xqci/qc.ligeui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lilt.yaml => Xqci/qc.lilt.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lilti.yaml => Xqci/qc.lilti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.liltu.yaml => Xqci/qc.liltu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.liltui.yaml => Xqci/qc.liltui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.line.yaml => Xqci/qc.line.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.linei.yaml => Xqci/qc.linei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lrb.yaml => Xqci/qc.lrb.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lrbu.yaml => Xqci/qc.lrbu.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lrh.yaml => Xqci/qc.lrh.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lrhu.yaml => Xqci/qc.lrhu.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lrw.yaml => Xqci/qc.lrw.yaml} (82%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lwm.yaml => Xqci/qc.lwm.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.lwmi.yaml => Xqci/qc.lwmi.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mpyaddi.yaml => Xqci/qc.muladdi.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mveq.yaml => Xqci/qc.mveq.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mveqi.yaml => Xqci/qc.mveqi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvge.yaml => Xqci/qc.mvge.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvgei.yaml => Xqci/qc.mvgei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvgeu.yaml => Xqci/qc.mvgeu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvgeui.yaml => Xqci/qc.mvgeui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvlt.yaml => Xqci/qc.mvlt.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvlti.yaml => Xqci/qc.mvlti.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvltu.yaml => Xqci/qc.mvltu.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvltui.yaml => Xqci/qc.mvltui.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvne.yaml => Xqci/qc.mvne.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.mvnei.yaml => Xqci/qc.mvnei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.norm.yaml => Xqci/qc.norm.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.normeu.yaml => Xqci/qc.normeu.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.normu.yaml => Xqci/qc.normu.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selecteqi.yaml => Xqci/qc.selecteqi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectieq.yaml => Xqci/qc.selectieq.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectieqi.yaml => Xqci/qc.selectieqi.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectiieq.yaml => Xqci/qc.selectiieq.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectiine.yaml => Xqci/qc.selectiine.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectine.yaml => Xqci/qc.selectine.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectinei.yaml => Xqci/qc.selectinei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.selectnei.yaml => Xqci/qc.selectnei.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.setinti.yaml => Xqci/qc.setinti.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.setwm.yaml => Xqci/qc.setwm.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.setwmi.yaml => Xqci/qc.setwmi.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.shladd.yaml => Xqci/qc.shladd.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.slasat.yaml => Xqci/qc.slasat.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.sllsat.yaml => Xqci/qc.sllsat.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.srb.yaml => Xqci/qc.srb.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.srh.yaml => Xqci/qc.srh.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.srw.yaml => Xqci/qc.srw.yaml} (94%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.subsat.yaml => Xqci/qc.subsat.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.subusat.yaml => Xqci/qc.subusat.yaml} (93%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.swm.yaml => Xqci/qc.swm.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.swmi.yaml => Xqci/qc.swmi.yaml} (96%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.wrap.yaml => Xqci/qc.wrap.yaml} (95%)
 rename cfgs/qc_iu/arch_overlay/inst/{Xqciu/qc32.wrapi.yaml => Xqci/qc.wrapi.yaml} (95%)
 delete mode 100644 cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh4add.yaml
 delete mode 100644 cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh5add.yaml
 delete mode 100644 cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh6add.yaml
 delete mode 100644 cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh7add.yaml
 delete mode 100644 cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh8add.yaml

diff --git a/backends/arch_gen/lib/arch_gen.rb b/backends/arch_gen/lib/arch_gen.rb
index cd158e0e9..1e239bbf1 100644
--- a/backends/arch_gen/lib/arch_gen.rb
+++ b/backends/arch_gen/lib/arch_gen.rb
@@ -702,7 +702,10 @@ def maybe_add_ext(ext_name)
 
     merged_path = gen_merged_def(:ext, arch_path, arch_overlay_path)
 
-    ext_obj = YAML.load_file(merged_path)[ext_name]
+    yaml_contents = YAML.load_file(merged_path)
+    raise "In #{merged_path}, key does not match file name" unless yaml_contents.key?(ext_name)
+
+    ext_obj = yaml_contents[ext_name]
     ext_obj["name"] = ext_name
 
     @implied_ext_map ||= {}
diff --git a/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb b/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
index 2154233ff..2b1b23aca 100644
--- a/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
+++ b/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
@@ -132,7 +132,8 @@ Copyright <%= ext_version["ratification_date"].nil? ? Date.today.year : ext_vers
 Contributors to version <%= version["version"] %> of the specification (in alphabetical order) include: +
 
 <%- version["contributors"].sort { |a, b| a["name"].split(" ").last <=> b["name"].split(" ").last }.each do |c| -%>
- * <%= c["name"] %> <<%= c["email"] %>> (<%= c["company"] %>)
+  * <%= c["name"] %> <<%= c["email"] %>> (<%= c["company"] %>)
+
 <%- end -%>
 <%- end -%>
 
@@ -419,8 +420,14 @@ RV64::
 Description::
 <%= i.description %>
 
+
 Decode Variables::
 
+<%- if i.multi_encoding? ? (i.decode_variables(32).empty? && i.decode_variables(64).empty?) : i.decode_variables(i.base.nil? ? 64 : i.base).empty? -%>
+
+<%= i.name %> has no decode variables.
+
+<%- else -%>
 <%- if i.multi_encoding? -%>
 RV32::
 +
@@ -446,7 +453,8 @@ RV64::
 <%= d.sext? ? 'signed ' : '' %>Bits<<%= d.size %>> <%= d.name %> = <%= d.extract %>;
 <%- end -%>
 ----
-<%- end -%>
+<%- end # if multi_encoding? -%>
+<%- end # if no decode variables-%>
 
 Operation::
 [source,idl,subs="specialchars,macros"]
@@ -491,4 +499,4 @@ h| Arguments   l| <%= f.arguments_list_str.join (', ') %>
 ----
 <%- end -%>
 
-<%- end -%>
\ No newline at end of file
+<%- end -%>
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/gen_mcliciX.rb b/cfgs/qc_iu/arch_overlay/csr/Xqci/gen_mcliciX.rb
similarity index 77%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/gen_mcliciX.rb
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/gen_mcliciX.rb
index 6a1fb8689..857c6defb 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/gen_mcliciX.rb
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/gen_mcliciX.rb
@@ -4,12 +4,12 @@
 pend_template = <<~YAML
   # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-  mclicip<%= num %>:
+  qc.mclicip<%= num %>:
     long_name: IRQ Pending <%= num %>
     address: 0x<%= (0x7f0 + num).to_s(16) %>
     length: 32
     priv_mode: M
-    definedBy: Xqciu
+    definedBy: Xqci
     description: |
       Pending bits for IRQs <%= num*32 %>-<%= (num + 1)*32 - 1 %>
     fields:
@@ -18,19 +18,19 @@
         type: RW
         reset_value: 0
         location: <%= i %>
-        description: IRQ<%= num*32 + 1 %> pending
+        description: IRQ<%= num*32 + i %> pending
       <%- end -%>
 YAML
 
 en_template = <<~YAML
   # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-  mclicie<%= num %>:
+  qc.mclicie<%= num %>:
     long_name: IRQ Enable <%= num %>
     address: 0x<%= (0x7f0 + num).to_s(16) %>
     length: 32
     priv_mode: M
-    definedBy: Xqciu
+    definedBy: Xqci
     description: |
       Enable bits for IRQs <%= num*32 %>-<%= (num + 1)*32 - 1 %>
     fields:
@@ -39,7 +39,7 @@
         type: RW
         reset_value: 0
         location: <%= i %>
-        description: IRQ<%= num*32 + 1 %> enabled
+        description: IRQ<%= num*32 + i %> enabled
       <%- end -%>
 YAML
 
@@ -47,10 +47,10 @@
 
 erb = ERB.new(pend_template, trim_mode: '-')
 8.times do |num|
-  File.write("#{root}/mclicip#{num}.yaml", erb.result(binding))
+  File.write("#{root}/qc.mclicip#{num}.yaml", erb.result(binding))
 end
 
 erb = ERB.new(en_template, trim_mode: '-')
 8.times do |num|
-  File.write("#{root}/mclicie#{num}.yaml", erb.result(binding))
+  File.write("#{root}/qc.mclicie#{num}.yaml", erb.result(binding))
 end
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie0.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie0.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie0.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie0.yaml
index ffa5d1e24..396ae0883 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie0.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie0.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie0:
+qc.mclicie0:
   long_name: IRQ Enable 0
   address: 0x7f0
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 0-31
   fields:
@@ -13,7 +13,7 @@ mclicie0:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ1 enabled
+      description: IRQ0 enabled
     IRQ1:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie0:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ1 enabled
+      description: IRQ2 enabled
     IRQ3:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ1 enabled
+      description: IRQ3 enabled
     IRQ4:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ1 enabled
+      description: IRQ4 enabled
     IRQ5:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ1 enabled
+      description: IRQ5 enabled
     IRQ6:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ1 enabled
+      description: IRQ6 enabled
     IRQ7:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ1 enabled
+      description: IRQ7 enabled
     IRQ8:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ1 enabled
+      description: IRQ8 enabled
     IRQ9:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ1 enabled
+      description: IRQ9 enabled
     IRQ10:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ1 enabled
+      description: IRQ10 enabled
     IRQ11:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ1 enabled
+      description: IRQ11 enabled
     IRQ12:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ1 enabled
+      description: IRQ12 enabled
     IRQ13:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ1 enabled
+      description: IRQ13 enabled
     IRQ14:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ1 enabled
+      description: IRQ14 enabled
     IRQ15:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ1 enabled
+      description: IRQ15 enabled
     IRQ16:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ1 enabled
+      description: IRQ16 enabled
     IRQ17:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ1 enabled
+      description: IRQ17 enabled
     IRQ18:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ1 enabled
+      description: IRQ18 enabled
     IRQ19:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ1 enabled
+      description: IRQ19 enabled
     IRQ20:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ1 enabled
+      description: IRQ20 enabled
     IRQ21:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ1 enabled
+      description: IRQ21 enabled
     IRQ22:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ1 enabled
+      description: IRQ22 enabled
     IRQ23:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ1 enabled
+      description: IRQ23 enabled
     IRQ24:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ1 enabled
+      description: IRQ24 enabled
     IRQ25:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ1 enabled
+      description: IRQ25 enabled
     IRQ26:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ1 enabled
+      description: IRQ26 enabled
     IRQ27:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ1 enabled
+      description: IRQ27 enabled
     IRQ28:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ1 enabled
+      description: IRQ28 enabled
     IRQ29:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ1 enabled
+      description: IRQ29 enabled
     IRQ30:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ1 enabled
+      description: IRQ30 enabled
     IRQ31:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ1 enabled
+      description: IRQ31 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie1.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie1.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie1.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie1.yaml
index ec7f0739b..21b38ca41 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie1.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie1.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie1:
+qc.mclicie1:
   long_name: IRQ Enable 1
   address: 0x7f1
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 32-63
   fields:
@@ -13,7 +13,7 @@ mclicie1:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ33 enabled
+      description: IRQ32 enabled
     IRQ33:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie1:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ33 enabled
+      description: IRQ34 enabled
     IRQ35:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ33 enabled
+      description: IRQ35 enabled
     IRQ36:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ33 enabled
+      description: IRQ36 enabled
     IRQ37:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ33 enabled
+      description: IRQ37 enabled
     IRQ38:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ33 enabled
+      description: IRQ38 enabled
     IRQ39:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ33 enabled
+      description: IRQ39 enabled
     IRQ40:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ33 enabled
+      description: IRQ40 enabled
     IRQ41:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ33 enabled
+      description: IRQ41 enabled
     IRQ42:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ33 enabled
+      description: IRQ42 enabled
     IRQ43:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ33 enabled
+      description: IRQ43 enabled
     IRQ44:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ33 enabled
+      description: IRQ44 enabled
     IRQ45:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ33 enabled
+      description: IRQ45 enabled
     IRQ46:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ33 enabled
+      description: IRQ46 enabled
     IRQ47:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ33 enabled
+      description: IRQ47 enabled
     IRQ48:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ33 enabled
+      description: IRQ48 enabled
     IRQ49:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ33 enabled
+      description: IRQ49 enabled
     IRQ50:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ33 enabled
+      description: IRQ50 enabled
     IRQ51:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ33 enabled
+      description: IRQ51 enabled
     IRQ52:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ33 enabled
+      description: IRQ52 enabled
     IRQ53:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ33 enabled
+      description: IRQ53 enabled
     IRQ54:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ33 enabled
+      description: IRQ54 enabled
     IRQ55:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ33 enabled
+      description: IRQ55 enabled
     IRQ56:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ33 enabled
+      description: IRQ56 enabled
     IRQ57:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ33 enabled
+      description: IRQ57 enabled
     IRQ58:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ33 enabled
+      description: IRQ58 enabled
     IRQ59:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ33 enabled
+      description: IRQ59 enabled
     IRQ60:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ33 enabled
+      description: IRQ60 enabled
     IRQ61:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ33 enabled
+      description: IRQ61 enabled
     IRQ62:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ33 enabled
+      description: IRQ62 enabled
     IRQ63:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ33 enabled
+      description: IRQ63 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie2.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie2.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie2.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie2.yaml
index e0f0f98e4..edf3e68c0 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie2.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie2.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie2:
+qc.mclicie2:
   long_name: IRQ Enable 2
   address: 0x7f2
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 64-95
   fields:
@@ -13,7 +13,7 @@ mclicie2:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ65 enabled
+      description: IRQ64 enabled
     IRQ65:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie2:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ65 enabled
+      description: IRQ66 enabled
     IRQ67:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ65 enabled
+      description: IRQ67 enabled
     IRQ68:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ65 enabled
+      description: IRQ68 enabled
     IRQ69:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ65 enabled
+      description: IRQ69 enabled
     IRQ70:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ65 enabled
+      description: IRQ70 enabled
     IRQ71:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ65 enabled
+      description: IRQ71 enabled
     IRQ72:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ65 enabled
+      description: IRQ72 enabled
     IRQ73:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ65 enabled
+      description: IRQ73 enabled
     IRQ74:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ65 enabled
+      description: IRQ74 enabled
     IRQ75:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ65 enabled
+      description: IRQ75 enabled
     IRQ76:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ65 enabled
+      description: IRQ76 enabled
     IRQ77:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ65 enabled
+      description: IRQ77 enabled
     IRQ78:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ65 enabled
+      description: IRQ78 enabled
     IRQ79:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ65 enabled
+      description: IRQ79 enabled
     IRQ80:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ65 enabled
+      description: IRQ80 enabled
     IRQ81:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ65 enabled
+      description: IRQ81 enabled
     IRQ82:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ65 enabled
+      description: IRQ82 enabled
     IRQ83:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ65 enabled
+      description: IRQ83 enabled
     IRQ84:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ65 enabled
+      description: IRQ84 enabled
     IRQ85:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ65 enabled
+      description: IRQ85 enabled
     IRQ86:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ65 enabled
+      description: IRQ86 enabled
     IRQ87:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ65 enabled
+      description: IRQ87 enabled
     IRQ88:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ65 enabled
+      description: IRQ88 enabled
     IRQ89:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ65 enabled
+      description: IRQ89 enabled
     IRQ90:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ65 enabled
+      description: IRQ90 enabled
     IRQ91:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ65 enabled
+      description: IRQ91 enabled
     IRQ92:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ65 enabled
+      description: IRQ92 enabled
     IRQ93:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ65 enabled
+      description: IRQ93 enabled
     IRQ94:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ65 enabled
+      description: IRQ94 enabled
     IRQ95:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ65 enabled
+      description: IRQ95 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie3.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie3.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie3.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie3.yaml
index abcd81a9e..aa76c4647 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie3.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie3.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie3:
+qc.mclicie3:
   long_name: IRQ Enable 3
   address: 0x7f3
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 96-127
   fields:
@@ -13,7 +13,7 @@ mclicie3:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ97 enabled
+      description: IRQ96 enabled
     IRQ97:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie3:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ97 enabled
+      description: IRQ98 enabled
     IRQ99:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ97 enabled
+      description: IRQ99 enabled
     IRQ100:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ97 enabled
+      description: IRQ100 enabled
     IRQ101:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ97 enabled
+      description: IRQ101 enabled
     IRQ102:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ97 enabled
+      description: IRQ102 enabled
     IRQ103:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ97 enabled
+      description: IRQ103 enabled
     IRQ104:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ97 enabled
+      description: IRQ104 enabled
     IRQ105:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ97 enabled
+      description: IRQ105 enabled
     IRQ106:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ97 enabled
+      description: IRQ106 enabled
     IRQ107:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ97 enabled
+      description: IRQ107 enabled
     IRQ108:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ97 enabled
+      description: IRQ108 enabled
     IRQ109:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ97 enabled
+      description: IRQ109 enabled
     IRQ110:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ97 enabled
+      description: IRQ110 enabled
     IRQ111:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ97 enabled
+      description: IRQ111 enabled
     IRQ112:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ97 enabled
+      description: IRQ112 enabled
     IRQ113:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ97 enabled
+      description: IRQ113 enabled
     IRQ114:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ97 enabled
+      description: IRQ114 enabled
     IRQ115:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ97 enabled
+      description: IRQ115 enabled
     IRQ116:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ97 enabled
+      description: IRQ116 enabled
     IRQ117:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ97 enabled
+      description: IRQ117 enabled
     IRQ118:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ97 enabled
+      description: IRQ118 enabled
     IRQ119:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ97 enabled
+      description: IRQ119 enabled
     IRQ120:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ97 enabled
+      description: IRQ120 enabled
     IRQ121:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ97 enabled
+      description: IRQ121 enabled
     IRQ122:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ97 enabled
+      description: IRQ122 enabled
     IRQ123:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ97 enabled
+      description: IRQ123 enabled
     IRQ124:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ97 enabled
+      description: IRQ124 enabled
     IRQ125:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ97 enabled
+      description: IRQ125 enabled
     IRQ126:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ97 enabled
+      description: IRQ126 enabled
     IRQ127:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ97 enabled
+      description: IRQ127 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie4.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie4.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie4.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie4.yaml
index 86efd9200..201e03c1e 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie4.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie4.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie4:
+qc.mclicie4:
   long_name: IRQ Enable 4
   address: 0x7f4
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 128-159
   fields:
@@ -13,7 +13,7 @@ mclicie4:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ129 enabled
+      description: IRQ128 enabled
     IRQ129:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie4:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ129 enabled
+      description: IRQ130 enabled
     IRQ131:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ129 enabled
+      description: IRQ131 enabled
     IRQ132:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ129 enabled
+      description: IRQ132 enabled
     IRQ133:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ129 enabled
+      description: IRQ133 enabled
     IRQ134:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ129 enabled
+      description: IRQ134 enabled
     IRQ135:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ129 enabled
+      description: IRQ135 enabled
     IRQ136:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ129 enabled
+      description: IRQ136 enabled
     IRQ137:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ129 enabled
+      description: IRQ137 enabled
     IRQ138:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ129 enabled
+      description: IRQ138 enabled
     IRQ139:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ129 enabled
+      description: IRQ139 enabled
     IRQ140:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ129 enabled
+      description: IRQ140 enabled
     IRQ141:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ129 enabled
+      description: IRQ141 enabled
     IRQ142:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ129 enabled
+      description: IRQ142 enabled
     IRQ143:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ129 enabled
+      description: IRQ143 enabled
     IRQ144:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ129 enabled
+      description: IRQ144 enabled
     IRQ145:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ129 enabled
+      description: IRQ145 enabled
     IRQ146:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ129 enabled
+      description: IRQ146 enabled
     IRQ147:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ129 enabled
+      description: IRQ147 enabled
     IRQ148:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ129 enabled
+      description: IRQ148 enabled
     IRQ149:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ129 enabled
+      description: IRQ149 enabled
     IRQ150:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ129 enabled
+      description: IRQ150 enabled
     IRQ151:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ129 enabled
+      description: IRQ151 enabled
     IRQ152:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ129 enabled
+      description: IRQ152 enabled
     IRQ153:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ129 enabled
+      description: IRQ153 enabled
     IRQ154:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ129 enabled
+      description: IRQ154 enabled
     IRQ155:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ129 enabled
+      description: IRQ155 enabled
     IRQ156:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ129 enabled
+      description: IRQ156 enabled
     IRQ157:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ129 enabled
+      description: IRQ157 enabled
     IRQ158:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ129 enabled
+      description: IRQ158 enabled
     IRQ159:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ129 enabled
+      description: IRQ159 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie5.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie5.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie5.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie5.yaml
index 90e89e913..1d2448d86 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie5.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie5.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie5:
+qc.mclicie5:
   long_name: IRQ Enable 5
   address: 0x7f5
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 160-191
   fields:
@@ -13,7 +13,7 @@ mclicie5:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ161 enabled
+      description: IRQ160 enabled
     IRQ161:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie5:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ161 enabled
+      description: IRQ162 enabled
     IRQ163:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ161 enabled
+      description: IRQ163 enabled
     IRQ164:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ161 enabled
+      description: IRQ164 enabled
     IRQ165:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ161 enabled
+      description: IRQ165 enabled
     IRQ166:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ161 enabled
+      description: IRQ166 enabled
     IRQ167:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ161 enabled
+      description: IRQ167 enabled
     IRQ168:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ161 enabled
+      description: IRQ168 enabled
     IRQ169:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ161 enabled
+      description: IRQ169 enabled
     IRQ170:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ161 enabled
+      description: IRQ170 enabled
     IRQ171:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ161 enabled
+      description: IRQ171 enabled
     IRQ172:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ161 enabled
+      description: IRQ172 enabled
     IRQ173:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ161 enabled
+      description: IRQ173 enabled
     IRQ174:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ161 enabled
+      description: IRQ174 enabled
     IRQ175:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ161 enabled
+      description: IRQ175 enabled
     IRQ176:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ161 enabled
+      description: IRQ176 enabled
     IRQ177:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ161 enabled
+      description: IRQ177 enabled
     IRQ178:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ161 enabled
+      description: IRQ178 enabled
     IRQ179:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ161 enabled
+      description: IRQ179 enabled
     IRQ180:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ161 enabled
+      description: IRQ180 enabled
     IRQ181:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ161 enabled
+      description: IRQ181 enabled
     IRQ182:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ161 enabled
+      description: IRQ182 enabled
     IRQ183:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ161 enabled
+      description: IRQ183 enabled
     IRQ184:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ161 enabled
+      description: IRQ184 enabled
     IRQ185:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ161 enabled
+      description: IRQ185 enabled
     IRQ186:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ161 enabled
+      description: IRQ186 enabled
     IRQ187:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ161 enabled
+      description: IRQ187 enabled
     IRQ188:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ161 enabled
+      description: IRQ188 enabled
     IRQ189:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ161 enabled
+      description: IRQ189 enabled
     IRQ190:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ161 enabled
+      description: IRQ190 enabled
     IRQ191:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ161 enabled
+      description: IRQ191 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie6.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie6.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie6.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie6.yaml
index 3bc629448..de9680293 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie6.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie6.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie6:
+qc.mclicie6:
   long_name: IRQ Enable 6
   address: 0x7f6
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 192-223
   fields:
@@ -13,7 +13,7 @@ mclicie6:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ193 enabled
+      description: IRQ192 enabled
     IRQ193:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie6:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ193 enabled
+      description: IRQ194 enabled
     IRQ195:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ193 enabled
+      description: IRQ195 enabled
     IRQ196:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ193 enabled
+      description: IRQ196 enabled
     IRQ197:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ193 enabled
+      description: IRQ197 enabled
     IRQ198:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ193 enabled
+      description: IRQ198 enabled
     IRQ199:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ193 enabled
+      description: IRQ199 enabled
     IRQ200:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ193 enabled
+      description: IRQ200 enabled
     IRQ201:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ193 enabled
+      description: IRQ201 enabled
     IRQ202:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ193 enabled
+      description: IRQ202 enabled
     IRQ203:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ193 enabled
+      description: IRQ203 enabled
     IRQ204:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ193 enabled
+      description: IRQ204 enabled
     IRQ205:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ193 enabled
+      description: IRQ205 enabled
     IRQ206:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ193 enabled
+      description: IRQ206 enabled
     IRQ207:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ193 enabled
+      description: IRQ207 enabled
     IRQ208:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ193 enabled
+      description: IRQ208 enabled
     IRQ209:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ193 enabled
+      description: IRQ209 enabled
     IRQ210:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ193 enabled
+      description: IRQ210 enabled
     IRQ211:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ193 enabled
+      description: IRQ211 enabled
     IRQ212:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ193 enabled
+      description: IRQ212 enabled
     IRQ213:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ193 enabled
+      description: IRQ213 enabled
     IRQ214:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ193 enabled
+      description: IRQ214 enabled
     IRQ215:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ193 enabled
+      description: IRQ215 enabled
     IRQ216:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ193 enabled
+      description: IRQ216 enabled
     IRQ217:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ193 enabled
+      description: IRQ217 enabled
     IRQ218:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ193 enabled
+      description: IRQ218 enabled
     IRQ219:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ193 enabled
+      description: IRQ219 enabled
     IRQ220:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ193 enabled
+      description: IRQ220 enabled
     IRQ221:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ193 enabled
+      description: IRQ221 enabled
     IRQ222:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ193 enabled
+      description: IRQ222 enabled
     IRQ223:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ193 enabled
+      description: IRQ223 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie7.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie7.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie7.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie7.yaml
index e1b8df518..b716427b8 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicie7.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicie7.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicie7:
+qc.mclicie7:
   long_name: IRQ Enable 7
   address: 0x7f7
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Enable bits for IRQs 224-255
   fields:
@@ -13,7 +13,7 @@ mclicie7:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ225 enabled
+      description: IRQ224 enabled
     IRQ225:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicie7:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ225 enabled
+      description: IRQ226 enabled
     IRQ227:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ225 enabled
+      description: IRQ227 enabled
     IRQ228:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ225 enabled
+      description: IRQ228 enabled
     IRQ229:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ225 enabled
+      description: IRQ229 enabled
     IRQ230:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ225 enabled
+      description: IRQ230 enabled
     IRQ231:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ225 enabled
+      description: IRQ231 enabled
     IRQ232:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ225 enabled
+      description: IRQ232 enabled
     IRQ233:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ225 enabled
+      description: IRQ233 enabled
     IRQ234:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ225 enabled
+      description: IRQ234 enabled
     IRQ235:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ225 enabled
+      description: IRQ235 enabled
     IRQ236:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ225 enabled
+      description: IRQ236 enabled
     IRQ237:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ225 enabled
+      description: IRQ237 enabled
     IRQ238:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ225 enabled
+      description: IRQ238 enabled
     IRQ239:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ225 enabled
+      description: IRQ239 enabled
     IRQ240:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ225 enabled
+      description: IRQ240 enabled
     IRQ241:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ225 enabled
+      description: IRQ241 enabled
     IRQ242:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ225 enabled
+      description: IRQ242 enabled
     IRQ243:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ225 enabled
+      description: IRQ243 enabled
     IRQ244:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ225 enabled
+      description: IRQ244 enabled
     IRQ245:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ225 enabled
+      description: IRQ245 enabled
     IRQ246:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ225 enabled
+      description: IRQ246 enabled
     IRQ247:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ225 enabled
+      description: IRQ247 enabled
     IRQ248:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ225 enabled
+      description: IRQ248 enabled
     IRQ249:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ225 enabled
+      description: IRQ249 enabled
     IRQ250:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ225 enabled
+      description: IRQ250 enabled
     IRQ251:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ225 enabled
+      description: IRQ251 enabled
     IRQ252:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ225 enabled
+      description: IRQ252 enabled
     IRQ253:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ225 enabled
+      description: IRQ253 enabled
     IRQ254:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ225 enabled
+      description: IRQ254 enabled
     IRQ255:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ225 enabled
+      description: IRQ255 enabled
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip0.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip0.yaml
similarity index 69%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip0.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip0.yaml
index 2453dc5a9..cc2af255d 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip0.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip0.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip0:
+qc.mclicip0:
   long_name: IRQ Pending 0
   address: 0x7f0
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 0-31
   fields:
@@ -13,7 +13,7 @@ mclicip0:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ1 pending
+      description: IRQ0 pending
     IRQ1:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip0:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ1 pending
+      description: IRQ2 pending
     IRQ3:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ1 pending
+      description: IRQ3 pending
     IRQ4:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ1 pending
+      description: IRQ4 pending
     IRQ5:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ1 pending
+      description: IRQ5 pending
     IRQ6:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ1 pending
+      description: IRQ6 pending
     IRQ7:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ1 pending
+      description: IRQ7 pending
     IRQ8:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ1 pending
+      description: IRQ8 pending
     IRQ9:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ1 pending
+      description: IRQ9 pending
     IRQ10:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ1 pending
+      description: IRQ10 pending
     IRQ11:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ1 pending
+      description: IRQ11 pending
     IRQ12:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ1 pending
+      description: IRQ12 pending
     IRQ13:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ1 pending
+      description: IRQ13 pending
     IRQ14:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ1 pending
+      description: IRQ14 pending
     IRQ15:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ1 pending
+      description: IRQ15 pending
     IRQ16:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ1 pending
+      description: IRQ16 pending
     IRQ17:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ1 pending
+      description: IRQ17 pending
     IRQ18:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ1 pending
+      description: IRQ18 pending
     IRQ19:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ1 pending
+      description: IRQ19 pending
     IRQ20:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ1 pending
+      description: IRQ20 pending
     IRQ21:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ1 pending
+      description: IRQ21 pending
     IRQ22:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ1 pending
+      description: IRQ22 pending
     IRQ23:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ1 pending
+      description: IRQ23 pending
     IRQ24:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ1 pending
+      description: IRQ24 pending
     IRQ25:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ1 pending
+      description: IRQ25 pending
     IRQ26:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ1 pending
+      description: IRQ26 pending
     IRQ27:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ1 pending
+      description: IRQ27 pending
     IRQ28:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ1 pending
+      description: IRQ28 pending
     IRQ29:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ1 pending
+      description: IRQ29 pending
     IRQ30:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ1 pending
+      description: IRQ30 pending
     IRQ31:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ1 pending
+      description: IRQ31 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip1.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip1.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip1.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip1.yaml
index babea3ab9..45c9562cc 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip1.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip1.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip1:
+qc.mclicip1:
   long_name: IRQ Pending 1
   address: 0x7f1
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 32-63
   fields:
@@ -13,7 +13,7 @@ mclicip1:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ33 pending
+      description: IRQ32 pending
     IRQ33:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip1:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ33 pending
+      description: IRQ34 pending
     IRQ35:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ33 pending
+      description: IRQ35 pending
     IRQ36:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ33 pending
+      description: IRQ36 pending
     IRQ37:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ33 pending
+      description: IRQ37 pending
     IRQ38:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ33 pending
+      description: IRQ38 pending
     IRQ39:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ33 pending
+      description: IRQ39 pending
     IRQ40:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ33 pending
+      description: IRQ40 pending
     IRQ41:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ33 pending
+      description: IRQ41 pending
     IRQ42:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ33 pending
+      description: IRQ42 pending
     IRQ43:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ33 pending
+      description: IRQ43 pending
     IRQ44:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ33 pending
+      description: IRQ44 pending
     IRQ45:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ33 pending
+      description: IRQ45 pending
     IRQ46:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ33 pending
+      description: IRQ46 pending
     IRQ47:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ33 pending
+      description: IRQ47 pending
     IRQ48:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ33 pending
+      description: IRQ48 pending
     IRQ49:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ33 pending
+      description: IRQ49 pending
     IRQ50:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ33 pending
+      description: IRQ50 pending
     IRQ51:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ33 pending
+      description: IRQ51 pending
     IRQ52:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ33 pending
+      description: IRQ52 pending
     IRQ53:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ33 pending
+      description: IRQ53 pending
     IRQ54:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ33 pending
+      description: IRQ54 pending
     IRQ55:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ33 pending
+      description: IRQ55 pending
     IRQ56:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ33 pending
+      description: IRQ56 pending
     IRQ57:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ33 pending
+      description: IRQ57 pending
     IRQ58:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ33 pending
+      description: IRQ58 pending
     IRQ59:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ33 pending
+      description: IRQ59 pending
     IRQ60:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ33 pending
+      description: IRQ60 pending
     IRQ61:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ33 pending
+      description: IRQ61 pending
     IRQ62:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ33 pending
+      description: IRQ62 pending
     IRQ63:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ33 pending
+      description: IRQ63 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip2.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip2.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip2.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip2.yaml
index f84b0bee8..ee8c8992a 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip2.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip2.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip2:
+qc.mclicip2:
   long_name: IRQ Pending 2
   address: 0x7f2
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 64-95
   fields:
@@ -13,7 +13,7 @@ mclicip2:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ65 pending
+      description: IRQ64 pending
     IRQ65:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip2:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ65 pending
+      description: IRQ66 pending
     IRQ67:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ65 pending
+      description: IRQ67 pending
     IRQ68:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ65 pending
+      description: IRQ68 pending
     IRQ69:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ65 pending
+      description: IRQ69 pending
     IRQ70:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ65 pending
+      description: IRQ70 pending
     IRQ71:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ65 pending
+      description: IRQ71 pending
     IRQ72:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ65 pending
+      description: IRQ72 pending
     IRQ73:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ65 pending
+      description: IRQ73 pending
     IRQ74:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ65 pending
+      description: IRQ74 pending
     IRQ75:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ65 pending
+      description: IRQ75 pending
     IRQ76:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ65 pending
+      description: IRQ76 pending
     IRQ77:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ65 pending
+      description: IRQ77 pending
     IRQ78:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ65 pending
+      description: IRQ78 pending
     IRQ79:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ65 pending
+      description: IRQ79 pending
     IRQ80:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ65 pending
+      description: IRQ80 pending
     IRQ81:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ65 pending
+      description: IRQ81 pending
     IRQ82:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ65 pending
+      description: IRQ82 pending
     IRQ83:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ65 pending
+      description: IRQ83 pending
     IRQ84:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ65 pending
+      description: IRQ84 pending
     IRQ85:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ65 pending
+      description: IRQ85 pending
     IRQ86:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ65 pending
+      description: IRQ86 pending
     IRQ87:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ65 pending
+      description: IRQ87 pending
     IRQ88:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ65 pending
+      description: IRQ88 pending
     IRQ89:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ65 pending
+      description: IRQ89 pending
     IRQ90:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ65 pending
+      description: IRQ90 pending
     IRQ91:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ65 pending
+      description: IRQ91 pending
     IRQ92:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ65 pending
+      description: IRQ92 pending
     IRQ93:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ65 pending
+      description: IRQ93 pending
     IRQ94:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ65 pending
+      description: IRQ94 pending
     IRQ95:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ65 pending
+      description: IRQ95 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip3.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip3.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip3.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip3.yaml
index 374588244..d2fe9014c 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip3.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip3.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip3:
+qc.mclicip3:
   long_name: IRQ Pending 3
   address: 0x7f3
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 96-127
   fields:
@@ -13,7 +13,7 @@ mclicip3:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ97 pending
+      description: IRQ96 pending
     IRQ97:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip3:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ97 pending
+      description: IRQ98 pending
     IRQ99:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ97 pending
+      description: IRQ99 pending
     IRQ100:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ97 pending
+      description: IRQ100 pending
     IRQ101:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ97 pending
+      description: IRQ101 pending
     IRQ102:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ97 pending
+      description: IRQ102 pending
     IRQ103:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ97 pending
+      description: IRQ103 pending
     IRQ104:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ97 pending
+      description: IRQ104 pending
     IRQ105:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ97 pending
+      description: IRQ105 pending
     IRQ106:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ97 pending
+      description: IRQ106 pending
     IRQ107:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ97 pending
+      description: IRQ107 pending
     IRQ108:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ97 pending
+      description: IRQ108 pending
     IRQ109:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ97 pending
+      description: IRQ109 pending
     IRQ110:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ97 pending
+      description: IRQ110 pending
     IRQ111:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ97 pending
+      description: IRQ111 pending
     IRQ112:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ97 pending
+      description: IRQ112 pending
     IRQ113:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ97 pending
+      description: IRQ113 pending
     IRQ114:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ97 pending
+      description: IRQ114 pending
     IRQ115:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ97 pending
+      description: IRQ115 pending
     IRQ116:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ97 pending
+      description: IRQ116 pending
     IRQ117:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ97 pending
+      description: IRQ117 pending
     IRQ118:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ97 pending
+      description: IRQ118 pending
     IRQ119:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ97 pending
+      description: IRQ119 pending
     IRQ120:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ97 pending
+      description: IRQ120 pending
     IRQ121:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ97 pending
+      description: IRQ121 pending
     IRQ122:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ97 pending
+      description: IRQ122 pending
     IRQ123:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ97 pending
+      description: IRQ123 pending
     IRQ124:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ97 pending
+      description: IRQ124 pending
     IRQ125:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ97 pending
+      description: IRQ125 pending
     IRQ126:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ97 pending
+      description: IRQ126 pending
     IRQ127:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ97 pending
+      description: IRQ127 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip4.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip4.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip4.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip4.yaml
index 911fd4258..39877258b 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip4.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip4.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip4:
+qc.mclicip4:
   long_name: IRQ Pending 4
   address: 0x7f4
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 128-159
   fields:
@@ -13,7 +13,7 @@ mclicip4:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ129 pending
+      description: IRQ128 pending
     IRQ129:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip4:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ129 pending
+      description: IRQ130 pending
     IRQ131:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ129 pending
+      description: IRQ131 pending
     IRQ132:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ129 pending
+      description: IRQ132 pending
     IRQ133:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ129 pending
+      description: IRQ133 pending
     IRQ134:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ129 pending
+      description: IRQ134 pending
     IRQ135:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ129 pending
+      description: IRQ135 pending
     IRQ136:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ129 pending
+      description: IRQ136 pending
     IRQ137:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ129 pending
+      description: IRQ137 pending
     IRQ138:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ129 pending
+      description: IRQ138 pending
     IRQ139:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ129 pending
+      description: IRQ139 pending
     IRQ140:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ129 pending
+      description: IRQ140 pending
     IRQ141:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ129 pending
+      description: IRQ141 pending
     IRQ142:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ129 pending
+      description: IRQ142 pending
     IRQ143:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ129 pending
+      description: IRQ143 pending
     IRQ144:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ129 pending
+      description: IRQ144 pending
     IRQ145:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ129 pending
+      description: IRQ145 pending
     IRQ146:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ129 pending
+      description: IRQ146 pending
     IRQ147:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ129 pending
+      description: IRQ147 pending
     IRQ148:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ129 pending
+      description: IRQ148 pending
     IRQ149:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ129 pending
+      description: IRQ149 pending
     IRQ150:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ129 pending
+      description: IRQ150 pending
     IRQ151:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ129 pending
+      description: IRQ151 pending
     IRQ152:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ129 pending
+      description: IRQ152 pending
     IRQ153:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ129 pending
+      description: IRQ153 pending
     IRQ154:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ129 pending
+      description: IRQ154 pending
     IRQ155:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ129 pending
+      description: IRQ155 pending
     IRQ156:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ129 pending
+      description: IRQ156 pending
     IRQ157:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ129 pending
+      description: IRQ157 pending
     IRQ158:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ129 pending
+      description: IRQ158 pending
     IRQ159:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ129 pending
+      description: IRQ159 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip5.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip5.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip5.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip5.yaml
index e8e4ca708..4009ea8b8 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip5.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip5.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip5:
+qc.mclicip5:
   long_name: IRQ Pending 5
   address: 0x7f5
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 160-191
   fields:
@@ -13,7 +13,7 @@ mclicip5:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ161 pending
+      description: IRQ160 pending
     IRQ161:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip5:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ161 pending
+      description: IRQ162 pending
     IRQ163:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ161 pending
+      description: IRQ163 pending
     IRQ164:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ161 pending
+      description: IRQ164 pending
     IRQ165:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ161 pending
+      description: IRQ165 pending
     IRQ166:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ161 pending
+      description: IRQ166 pending
     IRQ167:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ161 pending
+      description: IRQ167 pending
     IRQ168:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ161 pending
+      description: IRQ168 pending
     IRQ169:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ161 pending
+      description: IRQ169 pending
     IRQ170:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ161 pending
+      description: IRQ170 pending
     IRQ171:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ161 pending
+      description: IRQ171 pending
     IRQ172:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ161 pending
+      description: IRQ172 pending
     IRQ173:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ161 pending
+      description: IRQ173 pending
     IRQ174:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ161 pending
+      description: IRQ174 pending
     IRQ175:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ161 pending
+      description: IRQ175 pending
     IRQ176:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ161 pending
+      description: IRQ176 pending
     IRQ177:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ161 pending
+      description: IRQ177 pending
     IRQ178:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ161 pending
+      description: IRQ178 pending
     IRQ179:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ161 pending
+      description: IRQ179 pending
     IRQ180:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ161 pending
+      description: IRQ180 pending
     IRQ181:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ161 pending
+      description: IRQ181 pending
     IRQ182:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ161 pending
+      description: IRQ182 pending
     IRQ183:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ161 pending
+      description: IRQ183 pending
     IRQ184:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ161 pending
+      description: IRQ184 pending
     IRQ185:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ161 pending
+      description: IRQ185 pending
     IRQ186:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ161 pending
+      description: IRQ186 pending
     IRQ187:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ161 pending
+      description: IRQ187 pending
     IRQ188:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ161 pending
+      description: IRQ188 pending
     IRQ189:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ161 pending
+      description: IRQ189 pending
     IRQ190:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ161 pending
+      description: IRQ190 pending
     IRQ191:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ161 pending
+      description: IRQ191 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip6.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip6.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip6.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip6.yaml
index 3fe8e5a78..894ed2e88 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip6.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip6.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip6:
+qc.mclicip6:
   long_name: IRQ Pending 6
   address: 0x7f6
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 192-223
   fields:
@@ -13,7 +13,7 @@ mclicip6:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ193 pending
+      description: IRQ192 pending
     IRQ193:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip6:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ193 pending
+      description: IRQ194 pending
     IRQ195:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ193 pending
+      description: IRQ195 pending
     IRQ196:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ193 pending
+      description: IRQ196 pending
     IRQ197:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ193 pending
+      description: IRQ197 pending
     IRQ198:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ193 pending
+      description: IRQ198 pending
     IRQ199:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ193 pending
+      description: IRQ199 pending
     IRQ200:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ193 pending
+      description: IRQ200 pending
     IRQ201:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ193 pending
+      description: IRQ201 pending
     IRQ202:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ193 pending
+      description: IRQ202 pending
     IRQ203:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ193 pending
+      description: IRQ203 pending
     IRQ204:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ193 pending
+      description: IRQ204 pending
     IRQ205:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ193 pending
+      description: IRQ205 pending
     IRQ206:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ193 pending
+      description: IRQ206 pending
     IRQ207:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ193 pending
+      description: IRQ207 pending
     IRQ208:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ193 pending
+      description: IRQ208 pending
     IRQ209:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ193 pending
+      description: IRQ209 pending
     IRQ210:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ193 pending
+      description: IRQ210 pending
     IRQ211:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ193 pending
+      description: IRQ211 pending
     IRQ212:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ193 pending
+      description: IRQ212 pending
     IRQ213:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ193 pending
+      description: IRQ213 pending
     IRQ214:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ193 pending
+      description: IRQ214 pending
     IRQ215:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ193 pending
+      description: IRQ215 pending
     IRQ216:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ193 pending
+      description: IRQ216 pending
     IRQ217:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ193 pending
+      description: IRQ217 pending
     IRQ218:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ193 pending
+      description: IRQ218 pending
     IRQ219:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ193 pending
+      description: IRQ219 pending
     IRQ220:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ193 pending
+      description: IRQ220 pending
     IRQ221:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ193 pending
+      description: IRQ221 pending
     IRQ222:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ193 pending
+      description: IRQ222 pending
     IRQ223:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ193 pending
+      description: IRQ223 pending
diff --git a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip7.yaml b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip7.yaml
similarity index 68%
rename from cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip7.yaml
rename to cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip7.yaml
index c02692979..1a3e9172a 100644
--- a/cfgs/qc_iu/arch_overlay/csr/Xqciu/mclicip7.yaml
+++ b/cfgs/qc_iu/arch_overlay/csr/Xqci/qc.mclicip7.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../../../schemas/csr_schema.json
 
-mclicip7:
+qc.mclicip7:
   long_name: IRQ Pending 7
   address: 0x7f7
   length: 32
   priv_mode: M
-  definedBy: Xqciu
+  definedBy: Xqci
   description: |
     Pending bits for IRQs 224-255
   fields:
@@ -13,7 +13,7 @@ mclicip7:
       type: RW
       reset_value: 0
       location: 0
-      description: IRQ225 pending
+      description: IRQ224 pending
     IRQ225:
       type: RW
       reset_value: 0
@@ -23,149 +23,149 @@ mclicip7:
       type: RW
       reset_value: 0
       location: 2
-      description: IRQ225 pending
+      description: IRQ226 pending
     IRQ227:
       type: RW
       reset_value: 0
       location: 3
-      description: IRQ225 pending
+      description: IRQ227 pending
     IRQ228:
       type: RW
       reset_value: 0
       location: 4
-      description: IRQ225 pending
+      description: IRQ228 pending
     IRQ229:
       type: RW
       reset_value: 0
       location: 5
-      description: IRQ225 pending
+      description: IRQ229 pending
     IRQ230:
       type: RW
       reset_value: 0
       location: 6
-      description: IRQ225 pending
+      description: IRQ230 pending
     IRQ231:
       type: RW
       reset_value: 0
       location: 7
-      description: IRQ225 pending
+      description: IRQ231 pending
     IRQ232:
       type: RW
       reset_value: 0
       location: 8
-      description: IRQ225 pending
+      description: IRQ232 pending
     IRQ233:
       type: RW
       reset_value: 0
       location: 9
-      description: IRQ225 pending
+      description: IRQ233 pending
     IRQ234:
       type: RW
       reset_value: 0
       location: 10
-      description: IRQ225 pending
+      description: IRQ234 pending
     IRQ235:
       type: RW
       reset_value: 0
       location: 11
-      description: IRQ225 pending
+      description: IRQ235 pending
     IRQ236:
       type: RW
       reset_value: 0
       location: 12
-      description: IRQ225 pending
+      description: IRQ236 pending
     IRQ237:
       type: RW
       reset_value: 0
       location: 13
-      description: IRQ225 pending
+      description: IRQ237 pending
     IRQ238:
       type: RW
       reset_value: 0
       location: 14
-      description: IRQ225 pending
+      description: IRQ238 pending
     IRQ239:
       type: RW
       reset_value: 0
       location: 15
-      description: IRQ225 pending
+      description: IRQ239 pending
     IRQ240:
       type: RW
       reset_value: 0
       location: 16
-      description: IRQ225 pending
+      description: IRQ240 pending
     IRQ241:
       type: RW
       reset_value: 0
       location: 17
-      description: IRQ225 pending
+      description: IRQ241 pending
     IRQ242:
       type: RW
       reset_value: 0
       location: 18
-      description: IRQ225 pending
+      description: IRQ242 pending
     IRQ243:
       type: RW
       reset_value: 0
       location: 19
-      description: IRQ225 pending
+      description: IRQ243 pending
     IRQ244:
       type: RW
       reset_value: 0
       location: 20
-      description: IRQ225 pending
+      description: IRQ244 pending
     IRQ245:
       type: RW
       reset_value: 0
       location: 21
-      description: IRQ225 pending
+      description: IRQ245 pending
     IRQ246:
       type: RW
       reset_value: 0
       location: 22
-      description: IRQ225 pending
+      description: IRQ246 pending
     IRQ247:
       type: RW
       reset_value: 0
       location: 23
-      description: IRQ225 pending
+      description: IRQ247 pending
     IRQ248:
       type: RW
       reset_value: 0
       location: 24
-      description: IRQ225 pending
+      description: IRQ248 pending
     IRQ249:
       type: RW
       reset_value: 0
       location: 25
-      description: IRQ225 pending
+      description: IRQ249 pending
     IRQ250:
       type: RW
       reset_value: 0
       location: 26
-      description: IRQ225 pending
+      description: IRQ250 pending
     IRQ251:
       type: RW
       reset_value: 0
       location: 27
-      description: IRQ225 pending
+      description: IRQ251 pending
     IRQ252:
       type: RW
       reset_value: 0
       location: 28
-      description: IRQ225 pending
+      description: IRQ252 pending
     IRQ253:
       type: RW
       reset_value: 0
       location: 29
-      description: IRQ225 pending
+      description: IRQ253 pending
     IRQ254:
       type: RW
       reset_value: 0
       location: 30
-      description: IRQ225 pending
+      description: IRQ254 pending
     IRQ255:
       type: RW
       reset_value: 0
       location: 31
-      description: IRQ225 pending
+      description: IRQ255 pending
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqciu.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqci.yaml
similarity index 61%
rename from cfgs/qc_iu/arch_overlay/ext/Xqciu.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqci.yaml
index 2a8760c13..b6742c634 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqciu.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqci.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqciu:
+Xqci:
   type: unprivileged
   long_name: Qualcomm uC extensions
   versions:
@@ -25,22 +25,40 @@ Xqciu:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
     changes: |
-      * Splits Xqciu into sub-extensions based on instruction type
+      * Splits Xqci into sub-extensions based on instruction type
       * Removed shXadd instructions in favor of generic shladd
+  - version: 0.3
+    state: development
+    ratification_date: null
+    contributors:
+    - name: Albert Yosher
+      company: Qualcomm Technologies, Inc.
+      email: ayosher@qti.qualcomm.com
+    - name: Derek Hower
+      company: Qualcomm Technologies, Inc.
+      email: dhower@qti.qualcomm.com
+    changes: |
+      * Rename extension and sub extensions to match toolchain guidelines
+      * Rename mnemonics to match toolchain guidelines
+      * Ensure every instruction belongs to at least one sub extension
     implies:
-    - [Xqcac, 0.1]
-    - [Xqcbi, 0.1]
-    - [Xqcbm, 0.1]
-    - [Xqccli, 0.1]
-    - [Xqccm, 0.1]
-    - [Xqccs, 0.1]
-    - [Xqcint, 0.1]
-    - [Xqcli, 0.1]
-    - [Xqclia, 0.1]
-    - [Xqclo, 0.1]
-    - [Xqclsm, 0.1]
+    - [Xqcia, 0.1]
+    - [Xqciac, 0.1]
+    - [Xqcibi, 0.1]
+    - [Xqcibm, 0.1]
+    - [Xqcicli, 0.1]
+    - [Xqcicm, 0.1]
+    - [Xqcics, 0.1]
+    - [Xqcicsr, 0.1]
+    - [Xqciint, 0.1]
+    - [Xqcilb, 0.1]
+    - [Xqcili, 0.1]
+    - [Xqcilia, 0.1]
+    - [Xqcilo, 0.1]
+    - [Xqcilsm, 0.1]
+    - [Xqcisls, 0.1]
   description: |
-    The Xqciu extension includes a set of instructions that improve RISC-V code density and
+    The Xqci extension includes a set of instructions that improve RISC-V code density and
     performance in microontrollers. It fills several gaps:
 
     Long immediates::
@@ -56,42 +74,42 @@ Xqciu:
 
     Load/store multiple::
     --
-    Xqciu adds instructions that load multiple sequential values from memory into multiple registers.
+    Xqci adds instructions that load multiple sequential values from memory into multiple registers.
     Analogous instructions for stores are also included.
     --
 
     Branch immediate instructions::
     --
     The base RISC-V ISA provides conditional branches that compare two register values.
-    Xqciu adds conditional branch instructions that compare an immediate value to a register value,
+    Xqci adds conditional branch instructions that compare an immediate value to a register value,
     reducing a common code sequence into a single instruction.
     --
 
     Conditional instructions::
     --
-    Xqciu includes a variety of conditional select instructions that pick one of two operand values based on the result of a condition
+    Xqci includes a variety of conditional select instructions that pick one of two operand values based on the result of a condition
     and conditional move instructions that either move a value or retain a value in a destination register based on the result of a condition.
     Conditional select and conditional move instructions help reduce code size and avoid branches in common code sequences.
     --
 
     Extra bit manipulation instructions::
     --
-    Xqciu expands upon the standard `B` extension by adding instructions for
+    Xqci expands upon the standard `B` extension by adding instructions for
     bit insertion/extraction, bit set/clear, sign and zero extension, and bit counting instructions.
     --
 
     Fast interrupt instructions::
     --
-    Xqciu adds instructions to accelerate interrupt handling, including instructions to quickly
+    Xqci adds instructions to accelerate interrupt handling, including instructions to quickly
     enable/disable interrupts and instructions to automatically save an interrupt frame.
     --
 
     Saturating arithemtic::
     --
-    Xqciu adds saturating arithmetic instructions to improve performance of fixed-point calculations.
+    Xqci adds saturating arithmetic instructions to improve performance of fixed-point calculations.
     --
 
-    Xqciu adds 16, 32, and 48-bit instruction encodings. The 16 and 32-bit encodings are allocated
+    Xqci adds 16, 32, and 48-bit instruction encodings. The 16 and 32-bit encodings are allocated
     in the custom opcode space so as not to conflict with standard RISC-V instructions. The 48-bit instructions
     follow the guidance for 48-bit instructions in the RISC-V standard, but are not allocated in reserved custom
     space since no such space has been defined by RISC-V International.
@@ -103,4 +121,4 @@ Xqciu:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcia.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcia.yaml
new file mode 100644
index 000000000..9814bdaaa
--- /dev/null
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcia.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=../../../../schemas/ext_schema.json
+
+Xqcia:
+  type: unprivileged
+  long_name: Qualcomm arithmetic
+  versions:
+  - version: 0.1
+    state: development
+    ratification_date: null
+    contributors:
+    - name: Albert Yosher
+      company: Qualcomm Technologies, Inc.
+      email: ayosher@qti.qualcomm.com
+    - name: Derek Hower
+      company: Qualcomm Technologies, Inc.
+      email: dhower@qti.qualcomm.com
+  description: |
+    The Xqcia extension includes eleven instructions to perform integer arithmetic.
+
+  doc_license:
+    name: Creative Commons Attribution 4.0 International License
+    url: https://creativecommons.org/licenses/by/4.0/
+  company:
+    name: Qualcomm Technologies, Inc.
+    url: https://qualcomm.com
+
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcac.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqciac.yaml
similarity index 89%
rename from cfgs/qc_iu/arch_overlay/ext/Xqcac.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqciac.yaml
index 0d3f276a3..14ea849d3 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqcac.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqciac.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqcac:
+Xqciac:
   type: unprivileged
   long_name: Qualcomm address calculation
   versions:
@@ -15,7 +15,7 @@ Xqcac:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqcbi extension includes three instructions to accelerate common
+    The Xqciac extension includes three instructions to accelerate common
     address calculations.
 
   doc_license:
@@ -25,4 +25,4 @@ Xqcac:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcibi.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcibi.yaml
new file mode 100644
index 000000000..a9e03a065
--- /dev/null
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcibi.yaml
@@ -0,0 +1,31 @@
+# yaml-language-server: $schema=../../../../schemas/ext_schema.json
+
+Xqcibi:
+  type: unprivileged
+  long_name: Qualcomm branch immediate
+  versions:
+  - version: 0.1
+    state: development
+    ratification_date: null
+    contributors:
+    - name: Albert Yosher
+      company: Qualcomm Technologies, Inc.
+      email: ayosher@qti.qualcomm.com
+    - name: Derek Hower
+      company: Qualcomm Technologies, Inc.
+      email: dhower@qti.qualcomm.com
+  description: |
+    The Xqcibi extension includes twelve conditional branch instructions that use an immediate
+    operand for a source.
+
+    All instructions in Xqcibi following the same relocation type as standard RISC-V branches
+    in the base architecture (e.g., BEQ, BNE, etc.).
+
+  doc_license:
+    name: Creative Commons Attribution 4.0 International License
+    url: https://creativecommons.org/licenses/by/4.0/
+  company:
+    name: Qualcomm Technologies, Inc.
+    url: https://qualcomm.com
+
+  
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcbm.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcibm.yaml
similarity index 87%
rename from cfgs/qc_iu/arch_overlay/ext/Xqcbm.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcibm.yaml
index 4e2c53b3e..3604e531a 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqcbm.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcibm.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqcbm:
+Xqcibm:
   type: unprivileged
   long_name: Qualcomm bit manipulation
   versions:
@@ -15,7 +15,7 @@ Xqcbm:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqcbm extension includes seven instructions that perform bit manipulation,
+    The Xqcibm extension includes thirty eight instructions that perform bit manipulation,
     include insertion and extraction.
 
   doc_license:
@@ -25,4 +25,4 @@ Xqcbm:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqccli.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcicli.yaml
similarity index 89%
rename from cfgs/qc_iu/arch_overlay/ext/Xqccli.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcicli.yaml
index aa0d9a00d..e985efe1b 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqccli.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcicli.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqccli:
+Xqcicli:
   type: unprivileged
   long_name: Qualcomm conditional load immediate
   versions:
@@ -15,7 +15,7 @@ Xqccli:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqccli extension includes twelve instructions that conditionally
+    The Xqcicli extension includes twelve instructions that conditionally
     load an immediate value.
 
   doc_license:
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqccm.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcicm.yaml
similarity index 88%
rename from cfgs/qc_iu/arch_overlay/ext/Xqccm.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcicm.yaml
index 1bc72c086..29931a7bc 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqccm.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcicm.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqccm:
+Xqcicm:
   type: unprivileged
   long_name: Qualcomm conditional move
   versions:
@@ -15,7 +15,7 @@ Xqccm:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqccm extension includes twelve conditional move instructions.
+    The Xqcicm extension includes thirteen conditional move instructions.
 
   doc_license:
     name: Creative Commons Attribution 4.0 International License
@@ -24,4 +24,4 @@ Xqccm:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqccs.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcics.yaml
similarity index 89%
rename from cfgs/qc_iu/arch_overlay/ext/Xqccs.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcics.yaml
index 164925c1e..0ad2846ac 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqccs.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcics.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqccs:
+Xqcics:
   type: unprivileged
   long_name: Qualcomm conditional select
   versions:
@@ -15,7 +15,7 @@ Xqccs:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqccs extension includes eight conditional select instructions.
+    The Xqcics extension includes eight conditional select instructions.
 
   doc_license:
     name: Creative Commons Attribution 4.0 International License
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcbi.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcicsr.yaml
similarity index 78%
rename from cfgs/qc_iu/arch_overlay/ext/Xqcbi.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcicsr.yaml
index 3b3f7c1b1..b9d8cc131 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqcbi.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcicsr.yaml
@@ -1,8 +1,8 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqcbi:
+Xqcicsr:
   type: unprivileged
-  long_name: Qualcomm branch immediate
+  long_name: Qualcomm CSR instructions
   versions:
   - version: 0.1
     state: development
@@ -15,8 +15,7 @@ Xqcbi:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqcbi extension includes twelve conditional branch instructions that use an immediate
-    operand for a source.
+    The Xqcicsr extension contains two instructions to read/write CSR which index is in register and not immediate.
 
   doc_license:
     name: Creative Commons Attribution 4.0 International License
@@ -25,4 +24,4 @@ Xqcbi:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcint.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqciint.yaml
similarity index 89%
rename from cfgs/qc_iu/arch_overlay/ext/Xqcint.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqciint.yaml
index 972165f51..31aefebe3 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqcint.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqciint.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqcint:
+Xqciint:
   type: unprivileged
   long_name: Qualcomm interrupt prologue/epilogue
   versions:
@@ -15,7 +15,7 @@ Xqcint:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqcint extension includes three instructions to accelerate interrupt
+    The Xqciint extension includes eleven instructions to accelerate interrupt
     servicing by performing common actions during ISR prologue/epilogue.
 
   doc_license:
@@ -25,4 +25,4 @@ Xqcint:
     name: Qualcomm Technologies, Inc.
     url: https://qualcomm.com
 
-  
\ No newline at end of file
+  
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcilb.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcilb.yaml
new file mode 100644
index 000000000..7514d5393
--- /dev/null
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcilb.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=../../../../schemas/ext_schema.json
+
+Xqcilb:
+  type: unprivileged
+  long_name: Qualcomm long branch
+  versions:
+  - version: 0.1
+    state: development
+    ratification_date: null
+    contributors:
+    - name: Albert Yosher
+      company: Qualcomm Technologies, Inc.
+      email: ayosher@qti.qualcomm.com
+    - name: Derek Hower
+      company: Qualcomm Technologies, Inc.
+      email: dhower@qti.qualcomm.com
+  description: |
+    The Xqcilb extension includes two 48-bit instructions to encode a long branch.
+
+  doc_license:
+    name: Creative Commons Attribution 4.0 International License
+    url: https://creativecommons.org/licenses/by/4.0/
+  company:
+    name: Qualcomm Technologies, Inc.
+    url: https://qualcomm.com
+
+  
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcli.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcili.yaml
similarity index 86%
rename from cfgs/qc_iu/arch_overlay/ext/Xqcli.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcili.yaml
index 5bcb8ee73..0d9c0cbb6 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqcli.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcili.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqcli:
+Xqcili:
   type: unprivileged
   long_name: Qualcomm long load immediate
   versions:
@@ -15,7 +15,7 @@ Xqcli:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqcli extension includes a two instructions that load large immediates than is available
+    The Xqcili extension includes a two instructions that load large immediates than is available
     with the base RISC-V ISA.
 
   doc_license:
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqclia.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcilia.yaml
similarity index 87%
rename from cfgs/qc_iu/arch_overlay/ext/Xqclia.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcilia.yaml
index 26caaa600..d32310d02 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqclia.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcilia.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqclia:
+Xqcilia:
   type: unprivileged
   long_name: Qualcomm long load immediate
   versions:
@@ -15,7 +15,7 @@ Xqclia:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqclia extension includes eight 48-bit instructions that perform arithmetic using
+    The Xqcilia extension includes eight 48-bit instructions that perform arithmetic using
     large immediates.
 
   doc_license:
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqclo.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcilo.yaml
similarity index 88%
rename from cfgs/qc_iu/arch_overlay/ext/Xqclo.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcilo.yaml
index eda64c54c..454de72ba 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqclo.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcilo.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqclo:
+Xqcilo:
   type: unprivileged
   long_name: Qualcomm large offset load/store
   versions:
@@ -15,7 +15,7 @@ Xqclo:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqclo extension includes eight 48-bit load/stores instructions that use an offset
+    The Xqcilo extension includes eight 48-bit load/stores instructions that use an offset
     larger than can be found in the base RISC-V ISA.
 
   doc_license:
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqclsm.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcilsm.yaml
similarity index 88%
rename from cfgs/qc_iu/arch_overlay/ext/Xqclsm.yaml
rename to cfgs/qc_iu/arch_overlay/ext/Xqcilsm.yaml
index d27728e38..ec14bbff3 100644
--- a/cfgs/qc_iu/arch_overlay/ext/Xqclsm.yaml
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcilsm.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../schemas/ext_schema.json
 
-Xqclsm:
+Xqcilsm:
   type: unprivileged
   long_name: Qualcomm load/store multiple
   versions:
@@ -15,7 +15,7 @@ Xqclsm:
       company: Qualcomm Technologies, Inc.
       email: dhower@qti.qualcomm.com
   description: |
-    The Xqclsm extension includes six instructions that transfer multiple values
+    The Xqcilsm extension includes six instructions that transfer multiple values
     between registers and memory.
 
   doc_license:
diff --git a/cfgs/qc_iu/arch_overlay/ext/Xqcisls.yaml b/cfgs/qc_iu/arch_overlay/ext/Xqcisls.yaml
new file mode 100644
index 000000000..a8a17c6a1
--- /dev/null
+++ b/cfgs/qc_iu/arch_overlay/ext/Xqcisls.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=../../../../schemas/ext_schema.json
+
+Xqcisls:
+  type: unprivileged
+  long_name: Qualcomm scaled load/store
+  versions:
+  - version: 0.1
+    state: development
+    ratification_date: null
+    contributors:
+    - name: Albert Yosher
+      company: Qualcomm Technologies, Inc.
+      email: ayosher@qti.qualcomm.com
+    - name: Derek Hower
+      company: Qualcomm Technologies, Inc.
+      email: dhower@qti.qualcomm.com
+  description: |
+    The Xqsls extension includes five load and three store instructions with a scaled index addressing mode.
+
+  doc_license:
+    name: Creative Commons Attribution 4.0 International License
+    url: https://creativecommons.org/licenses/by/4.0/
+  company:
+    name: Qualcomm Technologies, Inc.
+    url: https://qualcomm.com
+
+  
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addsat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addsat.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addsat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addsat.yaml
index e8b688c86..ae93d92a2 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addsat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addsat.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.addsat:
+qc.addsat:
   long_name: Saturating signed addition
   description: |
     Add signed values `rs1` and `rs2`, saturate the signed result, and write to `rd`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0001110----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addusat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addusat.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addusat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addusat.yaml
index 60db0789a..85d90a735 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.addusat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.addusat.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.addusat:
+qc.addusat:
   long_name: Saturating unsigned addition
   description: |
     Add unsigned values `rs1` and `rs2`, saturate the unsigned result, and write to `rd`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0001111----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.beqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.beqi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.beqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.beqi.yaml
index bf9701f0c..8c819ed9a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.beqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.beqi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.beqi:
+qc.beqi:
   long_name: Branch on equal (Immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is equal to the signed immediate
   definedBy:
-  - Xqciu
-  - Zqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------000-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgei.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgei.yaml
index 0c98e55f0..9354e4e64 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.bgei:
+qc.bgei:
   long_name: Branch on greater than or equal (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is greater than or equal to the immediate.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------101-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgeui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgeui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgeui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgeui.yaml
index 1bcb08e8f..87325dbb7 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bgeui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bgeui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.bgeui:
+qc.bgeui:
   long_name: Branch on greater than or equal unsigned (immediate)
   description: |
     Branches to `PC` + `offset` if the unsigned value in `rs1` is greater than or equal to the unsigned immediate.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------111-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.blti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.blti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.blti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.blti.yaml
index b7255c1ad..f9a6c7406 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.blti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.blti.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.blti:
+qc.blti:
   long_name: Branch on less than (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is less than the immediate.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------100-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bltui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bltui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bltui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bltui.yaml
index 1bdbc7345..a23fa7f6a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bltui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bltui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.bltui:
+qc.bltui:
   long_name: Branch on less than unsigned (immediate)
   description: |
     Branches to `PC` + `offset` if the unsigned value in `rs1` is less than the unsigned immediate.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------110-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bnei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bnei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bnei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bnei.yaml
index c6c30df90..93a1b1b08 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.bnei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.bnei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.bnei:
+qc.bnei:
   long_name: Branch on not equal (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is not equal to the signed immediate
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------001-----1111011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.brev32.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.brev32.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.brev32.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.brev32.yaml
index 8b5ddaf25..03349fd28 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.brev32.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.brev32.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.brev32:
+qc.brev32:
   long_name: Reverse bit order
   description: |
     Reverses the bit order of `rs1` and writes the result to `rd`
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000011000000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bexti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bexti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bexti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bexti.yaml
index 67c52a52c..32503743c 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bexti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bexti.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.bexti:
+qc.c.bexti:
   long_name: Single-Bit extract (Immediate)
   description: |
     This instruction returns a single bit extracted from `rd`.
     The index is read from the lower log2(XLEN) bits of `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   assembly: " xd, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bseti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bseti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bseti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bseti.yaml
index 31bfddeac..30ee30749 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.bseti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.bseti.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.bseti:
+qc.c.bseti:
   long_name: Single-Bit set (Immediate)
   description: |
     This instruction returns `rd` with a single bit set at the index specified in shamt.
     The index is read from the lower log2(XLEN) bits of `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   assembly: " xd, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.clrint.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.clrint.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.clrint.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.clrint.yaml
index 87b2f3606..ed42f5d07 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.clrint.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.clrint.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.clrint:
+qc.c.clrint:
   long_name: Clear interrupt (Register)
   description: |
     Clear interrupt, interrupt number is in `rs1`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " xs1"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.delay.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.delay.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.delay.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.delay.yaml
index 2051eae16..6e36437fe 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.delay.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.delay.yaml
@@ -1,10 +1,10 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.delay:
+qc.c.delay:
   long_name: Delay execution
   description: |
     Delay execution for given `imm` amount of cycles.
-  definedBy: Xqciu
+  definedBy: Xqcipr
   assembly: " imm"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.di.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.di.yaml
similarity index 91%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.di.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.di.yaml
index 7f4ed2563..7344d2767 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.di.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.di.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.di:
+qc.c.di:
   long_name: Disable interrupts
   description: |
     Globally disable interrupts.
     Equivalent to "csrrci `zero`, `mstatus`, 8".
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: ""
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.dir.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.dir.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.dir.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.dir.yaml
index dd623683e..d444436b6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.dir.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.dir.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.dir:
+qc.c.dir:
   long_name: Disable interrupts (Register)
   description: |
     Globally disable interrupts, write previous value of `mstatus` to `rd`.
     Equivalent to "csrrci `rd`, `mstatus`, 8".
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " xd"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.ei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.ei.yaml
similarity index 91%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.ei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.ei.yaml
index ecd692c54..790cd5a8e 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.ei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.ei.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.ei:
+qc.c.ei:
   long_name: Enable interrupts
   description: |
     Globally enable interrupts.
     Equivalent to "csrrsi `zero`, `mstatus`, 8".
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: ""
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.eir.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.eir.yaml
similarity index 91%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.eir.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.eir.yaml
index 35eac4b44..888a3c1b3 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.eir.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.eir.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.eir:
+qc.c.eir:
   long_name: Restore interrupts (Register)
   description: |
     Globally restore interrupts, write `rs1` to `mstatus`.
     Equivalent to "csrrs `zero`, `mstatus`, `rs1`".
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " xs1"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.extu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.extu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.extu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.extu.yaml
index d6f82519a..cfc58852c 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.extu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.extu.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.extu:
+qc.c.extu:
   long_name: Extract bits unsigned
   description: |
     Extract a subset of bits from `rd` starting from LSB.
     The width of the subset is determined by (`width_minus1`[4:0] + 1) (1..32).
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   assembly: " xd, width"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.nest.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.nest.yaml
similarity index 97%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.nest.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.nest.yaml
index a639b8c50..ccb2cb6a6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.nest.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.nest.yaml
@@ -1,4 +1,4 @@
-qc16.mienter.nest:
+qc.c.mienter.nest:
   long_name: Machine mode interrupt enter
   description: |
     Machine mode interrupt enter, interrupt nesting is enabled.
@@ -6,8 +6,8 @@ qc16.mienter.nest:
     Interrupts are enabled.
   assembly: ""
   definedBy:
-  - Xqciu
-  - Xqcint
+  - Xqci
+  - Xqciint
   access:
     s: never
     u: never
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.yaml
similarity index 98%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.yaml
index 05e76cd33..831df9fe1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mienter.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mienter.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.mienter:
+qc.c.mienter:
   long_name: Machine mode interrupt enter
   description: |
     Machine mode interrupt enter, interrupt nesting is disabled.
@@ -8,8 +8,8 @@ qc16.mienter:
     Interrupts are disabled.
   assembly: ""
   definedBy:
-  - Xqciu
-  - Xqcint
+  - Xqci
+  - Xqciint
   access:
     s: never
     u: never
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mileaveret.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mileaveret.yaml
similarity index 97%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mileaveret.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mileaveret.yaml
index 2b8ebe4d6..ff50eccae 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mileaveret.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mileaveret.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.mileaveret:
+qc.c.mileaveret:
   long_name: Machine mode interrupt exit
   description: |
     Machine mode interrupt exit.
     Interrupt frame is restored from the stack.
   assembly: ""
   definedBy:
-  - Xqciu
-  - Xqcint
+  - Xqci
+  - Xqciint
   access:
     s: never
     u: never
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mnret.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mnret.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mnret.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mnret.yaml
index d5e529f71..b716c8da5 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mnret.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mnret.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.mnret:
+qc.c.mnret:
   long_name: Machine NMI Return
   description: |
     Returns from an NMI in M-mode.
   assembly: ""
-  definedBy: Xqciu
+  definedBy: Xqcipr
   access:
     s: never
     u: never
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mret.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mret.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mret.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mret.yaml
index b417d0596..51228d898 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mret.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mret.yaml
@@ -1,11 +1,11 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.mret:
+qc.c.mret:
   long_name: Machine Exception Return
   description: |
     Returns from an exception in M-mode.
   assembly: ""
-  definedBy: Xqciu
+  definedBy: Xqcipr
   access:
     s: never
     u: never
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mpyaddi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.muladdi.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mpyaddi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.muladdi.yaml
index a2dff0d7d..a36623d6a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mpyaddi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.muladdi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc16.mpyaddi:
+qc.c.muladdi:
   long_name: Multiply and accumulate (Immediate)
   description: |
     Increments `rd` by the multiplication of `rs1` and an unsigned immediate
   definedBy:
-  - Xqciu
-  - Xqcac
+  - Xqci
+  - Xqciac
   base: 32
   encoding:
     match: 001-----------10
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mveqz.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mveqz.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mveqz.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mveqz.yaml
index 5d6b81f85..afecd2b1d 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.mveqz.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.mveqz.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc16.mveqz:
+qc.c.mveqz:
   long_name: Conditional Move if equal to zero
   description: |
     Move `rs1` to `rd` if `rd` == 0, keep `rd` value otherwise
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     101011---00---10
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.setint.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.setint.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.setint.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.setint.yaml
index 249d62eb7..0e7535343 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc16.setint.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.c.setint.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc16.setint:
+qc.c.setint:
   long_name: Set interrupt (Register)
   description: |
     Set interrupt, interrupt number is in `rs1`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " xs1"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clo.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clo.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clo.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clo.yaml
index c5616683f..f2705101f 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clo.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clo.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.clo:
+qc.clo:
   long_name: Count leading ones
   description: |
     Count the number of ones before the first zero in `rs1`, starting from the MSB
@@ -8,7 +8,9 @@ qc32.clo:
     Accordingly, if the input is ~0, the output is XLEN, and if the most-significant
     bit of the input is a 0, the output is 0.
     output written to the `rd`
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000010000000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clrinti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clrinti.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clrinti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clrinti.yaml
index fd60c4e83..02657f4b1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.clrinti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.clrinti.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.clrinti:
+qc.clrinti:
   long_name: Clear interrupt (Immediate)
   description: |
     Clear interrupt, interrupt number is in `imm` (0 - 1023).
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " imm"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress2.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress2.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress2.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress2.yaml
index 6e0957dcc..baf6ff944 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress2.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress2.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.compress2:
+qc.compress2:
   long_name: Bit compression (every 2nd bit)
   description: |
     Bit compression (every 2nd bit) of `rs1`, zero-pad bits [31:16] of the result.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000000000000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress3.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress3.yaml
similarity index 79%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress3.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress3.yaml
index f272ecd42..bf1aa5401 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.compress3.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.compress3.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.compress3:
-  long_name: Bit compression (every 3nd bit)
+qc.compress3:
+  long_name: Bit compression (every 3rd bit)
   description: |
-    Bit compression (every 3nd bit) of `rs1`, zero-pad bits [31:11] of the result.
+    Bit compression (every 3rd bit) of `rs1`, zero-pad bits [31:11] of the result.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000000100000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwr.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwr.yaml
index 65db045fc..88fabd7c6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwr.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.csrrwr:
+qc.csrrwr:
   long_name: Atomic Read/Write CSR (Register)
   description: |
     Atomically swap values in the CSRs and integer registers.
@@ -10,8 +10,10 @@ qc32.csrrwr:
     The initial value in `rs1` is written to the CSR.
     If `rd`=`x0`, then the instruction shall not read the CSR and shall not
     cause any of the side effects that might occur on a CSR read.
-  definedBy: Xqciu
-  assembly: " xd, xs1, xs2"
+  definedBy:
+  - Xqci
+  - Xqcicsr
+  assembly: xd, xs1, xs2
   encoding:
     match: 1000110----------000-----1110011
     variables:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwri.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwri.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwri.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwri.yaml
index 669d8b235..10322d772 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.csrrwri.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.csrrwri.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.csrrwri:
+qc.csrrwri:
   long_name: Atomic Read/Write CSR (Register) Immediate
   description: |
     Atomically write CSR using a 5-bit immediate `imm`, and load the previous value into `rd`.
@@ -10,7 +10,9 @@ qc32.csrrwri:
     The 5-bit uimm field is zero-extended and written to the CSR.
     If `rd`=`x0`, then the instruction shall not read the CSR and shall not
     cause any of the side effects that might occur on a CSR read.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcicsr
   assembly: " xd, imm, xs2"
   encoding:
     match: 1000111----------000-----1110011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.cto.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.cto.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.cto.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.cto.yaml
index 8bf66da9c..f39a838d3 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.cto.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.cto.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.cto:
+qc.cto:
   long_name: Count trailing ones
   description: |
     Count the number of ones before the first zero in `rs1`, starting from the LSB
@@ -8,7 +8,9 @@ qc32.cto:
     Accordingly, if the input is ~0, the output is XLEN, and if the least-significant
     bit of the input is a 0, the output is 0.
     Output written to `rd`
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000010100000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addai.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addai.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addai.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addai.yaml
index 2093e3f72..0c201965a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addai.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addai.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.addai:
+qc.e.addai:
   long_name: Add immediate
   description: |
     Add a 32-bit immediate `imm` to the value in `rd`, and store the result back in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     --------------------------------0010-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addi.yaml
index 3998f7391..b977824b1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.addi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.addi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.addi:
+qc.e.addi:
   long_name: Add immediate
   description: |
     Add a sign-extended 26-bit immediate `imm` to the value in `rs1`, 
     and store the result in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     ----------------10---------------011-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andai.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andai.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andai.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andai.yaml
index d385e0541..8820a2684 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andai.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andai.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.andai:
+qc.e.andai:
   long_name: And immediate
   description: |
     And a 32-bit immediate `imm` to the value in `rd`, and store the result back in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     --------------------------------1010-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andi.yaml
index 2f8510e40..b915a5749 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.andi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.andi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.andi:
+qc.e.andi:
   long_name: Add immediate
   description: |
     And a sign-extended 26-bit immediate `imm` to the value in `rs1`, 
     and store the result in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     ----------------11---------------011-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.beqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.beqi.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.beqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.beqi.yaml
index 446f345ed..10eda153b 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.beqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.beqi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.beqi:
+qc.e.beqi:
   long_name: Branch on equal (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is equal to the signed immediate `imm`
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11000-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgei.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgei.yaml
index bfa83d07a..5652871f5 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.bgei:
+qc.e.bgei:
   long_name: Branch on greater than or equal (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is greater than or equal to the immediate `imm`.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11101-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgeui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgeui.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgeui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgeui.yaml
index 7d93349d3..68ddb3c43 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bgeui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bgeui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.bgeui:
+qc.e.bgeui:
   long_name: Branch on greater than or equal unsigned (immediate)
   description: |
     Branches to `PC` + `offset` if the unsigned value in `rs1` is greater than or equal to the unsigned immediate `imm`.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11111-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.blti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.blti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.blti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.blti.yaml
index 94bc64355..05fba32bb 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.blti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.blti.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.blti:
+qc.e.blti:
   long_name: Branch on less than (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is less than the immediate `imm`.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11100-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bltui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bltui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bltui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bltui.yaml
index 283a7a290..260b8b692 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bltui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bltui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.bltui:
+qc.e.bltui:
   long_name: Branch on less than unsigned (immediate)
   description: |
     Branches to `PC` + `offset` if the unsigned value in `rs1` is less than the unsigned immediate `imm`.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11110-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bnei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bnei.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bnei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bnei.yaml
index a953b0288..4fb12a335 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.bnei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.bnei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.bnei:
+qc.e.bnei:
   long_name: Branch on not equal (immediate)
   description: |
     Branches to `PC` + `offset` if the value in `rs1` is not equal to the signed immediate `imm`.
   definedBy:
-  - Xqciu
-  - Xqcbi
+  - Xqci
+  - Xqcibi
   base: 32
   encoding:
     match:     -----------------------11001-----100-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.j.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.j.yaml
similarity index 92%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.j.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.j.yaml
index a5a8a44eb..3d0b1b04a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.j.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.j.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.j:
+qc.e.j:
   long_name: Jump
   description: |
     Jump to a PC-relative offset 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcilb
   assembly: " imm"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.jal.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.jal.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.jal.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.jal.yaml
index 5f43ede29..9555a15e1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.jal.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.jal.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.jal:
+qc.e.jal:
   long_name: Jump and link
   description: |
     Jump to a PC-relative offset and store the return
     address in x1.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcilb
   assembly: " imm"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lb.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lb.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lb.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lb.yaml
index c8be43b43..3ecde76c8 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lb.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lb.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.lb:
+qc.e.lb:
   long_name: Load byte
   description: |
     Load 8 bits of data into register `rd` from an
     address formed by adding `rs1` to a signed offset `imm`.
     Sign extend the result.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xd, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lbu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lbu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lbu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lbu.yaml
index b12891b41..8ad7f8304 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lbu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lbu.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.lbu:
+qc.e.lbu:
   long_name: Load byte unsigned
   description: |
     Load 8 bits of data into register `rd` from an
     address formed by adding `rs1` to a signed offset `imm`.
     Zero extend the result.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xd, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lh.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lh.yaml
index 44de269bc..e4e95cf75 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lh.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.lh:
+qc.e.lh:
   long_name: Load halfword
   description: |
     Load 16 bits of data into register `rd` from an
     address formed by adding `rs1` to a signed offset `imm`.
     Sign extend the result.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xd, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lhu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lhu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lhu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lhu.yaml
index 790fca149..f28f2e906 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lhu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lhu.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.lhu:
+qc.e.lhu:
   long_name: Load halfword unsigned
   description: |
     Load 16 bits of data into register `rd` from an
     address formed by adding `rs1` to a signed offset `imm`.
     Zero extend the result.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xd, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.li.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.li.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.li.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.li.yaml
index 89afd034f..8459ed9b6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.li.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.li.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.li:
+qc.e.li:
   long_name: Load immediate large
   description: |
     Loads the 32-bit immediate `imm` into `rd`.
   definedBy:
-  - Xqciu
-  - Xqcli
+  - Xqci
+  - Xqcili
   base: 32
   encoding:
     match:     --------------------------------0000-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lw.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lw.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lw.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lw.yaml
index a2f85de71..c11f24a9e 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.lw.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.lw.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.lw:
+qc.e.lw:
   long_name: Load word
   description: |
     Load 32 bits of data into register `rd` from an
     address formed by adding `rs1` to a signed offset `imm`.
     Sign extend the result.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xd, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.orai.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.orai.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.orai.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.orai.yaml
index e4c910453..3aa2e394c 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.orai.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.orai.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.orai:
+qc.e.orai:
   long_name: Or immediate
   description: |
     Or a 32-bit immediate `imm` to the value in `rd`, and store the result back in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     --------------------------------1001-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.ori.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.ori.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.ori.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.ori.yaml
index d7f9f0d86..498388c61 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.ori.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.ori.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.ori:
+qc.e.ori:
   long_name: Or immediate
   description: |
     Or a sign-extended 26-bit immediate `imm` to the value in `rs1`, 
     and store the result in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     ----------------01---------------011-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sb.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sb.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sb.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sb.yaml
index f99a3b1fe..827c154af 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sb.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sb.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.sb:
+qc.e.sb:
   long_name: Store byte
   description: |
     Store 8 bits of data from register `rs2` to an
     address formed by adding `rs1` to a signed offset `imm`.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xs2, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sh.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sh.yaml
index 3737dcf3a..8fdf343af 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sh.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.sh:
+qc.e.sh:
   long_name: Store halfword
   description: |
     Store 16 bits of data from register `rs2` to an
     address formed by adding `rs1` to a signed offset `imm`.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xs2, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sw.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sw.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sw.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sw.yaml
index fb31f3823..1d96e7401 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.sw.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.sw.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc48.sw:
+qc.e.sw:
   long_name: Store word
   description: |
     Store 32 bits of data from register `rs2` to an
     address formed by adding `rs1` to a signed offset `imm`.
   definedBy:
-  - Xqciu
-  - Xqclo
+  - Xqci
+  - Xqcilo
   assembly: " xs2, imm(xs1)"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xorai.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xorai.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xorai.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xorai.yaml
index c6145b1fb..fe2d46db2 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xorai.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xorai.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.xorai:
+qc.e.xorai:
   long_name: Exclusive Or immediate
   description: |
     Exclusive or a 32-bit immediate `imm` to the value in `rd`, and store the result back in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     --------------------------------0001-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xori.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xori.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xori.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xori.yaml
index f384fc43e..1e5292a92 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc48.xori.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.e.xori.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc48.xori:
+qc.e.xori:
   long_name: Exclusive Or immediate
   description: |
     Exclusive or a sign-extended 26-bit immediate `imm` to the value in `rs1`, 
     and store the result in `rd`.
   definedBy:
-  - Xqciu
-  - Xqclia
+  - Xqci
+  - Xqcilia
   base: 32
   encoding:
     match:     ----------------00---------------011-----0011111
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand2.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand2.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand2.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand2.yaml
index 2be236eb2..f86637181 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand2.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand2.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.expand2:
+qc.expand2:
   long_name: Bit expansion (every 2nd bit)
   description: |
     Bit expansion (every 2nd bit) of `rs1`, bits [31:16] of `rs1` are ignored.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000001000000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand3.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand3.yaml
similarity index 85%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand3.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand3.yaml
index 5e589c7ab..975603bc6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.expand3.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.expand3.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.expand3:
-  long_name: Bit expansion (every 3nd bit)
+qc.expand3:
+  long_name: Bit expansion (every 3rd bit)
   description: |
-    Bit expansion (every 3nd bit) of `rs1`, bits [31:11] of `rs1` are ignored.
+    Bit expansion (every 3rd bit) of `rs1`, bits [31:11] of `rs1` are ignored.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     000001100000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.exts.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ext.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.exts.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ext.yaml
index 2e8fd7fe5..abe860c7f 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.exts.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ext.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.exts:
+qc.ext:
   long_name: Extract bits signed
   description: |
     Extract a subset of bits from `rs1` into `rd`, and sign-extend the result.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset of the subset is determined by `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     01---------------010-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extds.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extd.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extds.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extd.yaml
index 72cc9c7b5..d9cc712f4 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extds.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extd.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extds:
+qc.extd:
   long_name: Extract bits from pair signed (Immediate)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`, and sign extend the result.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset (into the pair) of the subset is determined by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     11---------------010-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdspr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdpr.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdspr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdpr.yaml
index d5b8b8fb2..9ae8bffa4 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdspr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdpr.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdspr:
+qc.extdpr:
   long_name: Extract bits from pair signed, packed descriptor (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`, and sign extend the result.
     The width of the subset is determined by `rs2` bits [15:8] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [7:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0001000----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsprh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdprh.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsprh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdprh.yaml
index 41974ac47..b2c4b2d2e 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsprh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdprh.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdsprh:
+qc.extdprh:
   long_name: Extract bits from pair signed, packed descriptor high part (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`, and sign extend the result.
     The width of the subset is determined by `rs2` bits [31:24] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [23:16].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0001001----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdr.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdr.yaml
index aa348a5cf..ef6f6a842 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdsr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdr.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdsr:
+qc.extdr:
   long_name: Extract bits from pair signed (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`, and sign extend the result.
     The width of the subset is determined by `rs2` bits [31:16] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [15:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000101----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdu.yaml
index e7b3df680..d3dc07475 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdu.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdu:
+qc.extdu:
   long_name: Extract bits from pair unsigned (Immediate)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset (into the pair) of the subset is determined by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     10---------------010-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdupr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdupr.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdupr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdupr.yaml
index e355ea865..8a6110e00 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdupr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdupr.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdupr:
+qc.extdupr:
   long_name: Extract bits from pair unsigned, packed descriptor (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`.
     The width of the subset is determined by `rs2` bits [15:8] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [7:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000110----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extduprh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extduprh.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extduprh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extduprh.yaml
index d3a26808b..71b158cf9 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extduprh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extduprh.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extduprh:
+qc.extduprh:
   long_name: Extract bits from pair unsigned, packed descriptor high part (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`.
     The width of the subset is determined by `rs2` bits [31:24] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [23:16].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000111----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdur.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdur.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdur.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdur.yaml
index 4efc61945..07c428468 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extdur.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extdur.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extdur:
+qc.extdur:
   long_name: Extract bits from pair unsigned (Register)
   description: |
     Extract a subset of bits from the register pair [`rs1`, `rs1`+1] into `rd`.
     The width of the subset is determined by `rs2` bits [31:16] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [15:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000100----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extu.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extu.yaml
index fdfe39821..e8a0359dc 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.extu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.extu.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.extu:
+qc.extu:
   long_name: Extract bits unsigned
   description: |
     Extract a subset of bits from `rs1` into `rd`.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset of the subset is determined by `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     00---------------010-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insb.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insb.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insb.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insb.yaml
index 96a4450ad..64c9f8dd8 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insb.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insb.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insb:
+qc.insb:
   long_name: Insert bits (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset of the subset is determined by `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     01---------------001-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbh.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbh.yaml
index e8d79f2c1..d35fb8b7a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbh.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbh:
+qc.insbh:
   long_name: Insert bits in 64-bit higher part (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
@@ -11,7 +11,9 @@ qc32.insbh:
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset of the subset is determined by `shamt`.
     In case when width + offset <= 32, the destination register is left unchanged.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     10---------------001-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbhr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbhr.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbhr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbhr.yaml
index 85d11ebbe..acd5d3455 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbhr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbhr.yaml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbhr:
+qc.insbhr:
   long_name: Insert bits in 64-bit higher part (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
@@ -11,7 +11,9 @@ qc32.insbhr:
     The width of the subset is determined by `rs2` bits [31:16] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [15:0].
     In case when width + offset <= 32, the destination register is left unchanged.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000001----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbi.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbi.yaml
index 08f7aafcb..3268e2af6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbi.yaml
@@ -1,14 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbi:
+qc.insbi:
   long_name: Insert bits (Immediate)
   description: |
     Insertion of a subset of bits of an `imm` into `rd`.
     The width of the subset is determined by (`width_minus1` + 1) (1..32),
     and the offset of the subset is determined by `shamt`.
   definedBy:
-  - Xqciu
-  - Xqcbm
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     00---------------001-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbpr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbpr.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbpr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbpr.yaml
index 3027ab5bf..ed9de3921 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbpr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbpr.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbpr:
+qc.insbpr:
   long_name: Insert bits, packed descriptor (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
     The width of the subset is determined by `rs2` bits [15:8] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [7:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000010----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbprh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbprh.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbprh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbprh.yaml
index 7f6aa7bd1..7c67885d1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbprh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbprh.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbprh:
+qc.insbprh:
   long_name: Insert bits, packed descriptor high part (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
     The width of the subset is determined by `rs2` bits [31:24] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [23:15].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000011----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbr.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbr.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbr.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbr.yaml
index 865983a2b..5fafc4f8b 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbr.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbr.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbr:
+qc.insbr:
   long_name: Insert bits (Register)
   description: |
     Insertion of a subset of bits from `rs1` into `rd`.
     The width of the subset is determined by `rs2` bits [31:16] + 1 (1..32),
     and the offset of the subset is determined by `rs2` bits [15:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     0000000----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbri.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbri.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbri.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbri.yaml
index 082da2597..657b84a90 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.insbri.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.insbri.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.insbri:
+qc.insbri:
   long_name: Insert bits (Immediate)
   description: |
     Insertion of a subset of bits of an `imm` into `rd`.
     The width of the subset is determined by `rs1` bits [31:16] + 1,
     and the offset of the subset is determined by `rs1` bits [15:0].
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcibm
   base: 32
   encoding:
     match:     1----------------000-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.li.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.li.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.li.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.li.yaml
index 79bfc1056..5a07b5832 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.li.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.li.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.li:
+qc.li:
   long_name: Load immediate large
   description: |
     Loads the 20-bit immediate `imm` into `rd`.
   definedBy:
-  - Xqciu
-  - Xqcli
+  - Xqci
+  - Xqcili
   base: 32
   encoding:
     match:     -------------------------0011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieq.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieq.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieq.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieq.yaml
index 0b3ef218a..32161d1b4 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieq.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieq.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lieq:
+qc.lieq:
   long_name: Conditional load immediate if equal (Register)
   description: |
     Move `simm` to `rd` if the value in `rs1` is equal to value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------000-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieqi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieqi.yaml
index bac507bf0..c38b2b7c6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lieqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lieqi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lieqi:
+qc.lieqi:
   long_name: Conditional load immediate if equal (Immediate)
   description: |
     Move `simm` to `rd` if the value in `rs1` is equal to value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------000-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lige.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lige.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lige.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lige.yaml
index 40d5f2b63..7c1f7ed3a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lige.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lige.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lige:
+qc.lige:
   long_name: Conditional load immediate if great or equal than (Register)
   description: |
     Move `simm` to `rd` if the value in `rs1` is great or equal than value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------101-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligei.yaml
index 806fa41a0..8fcd92224 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.ligei:
+qc.ligei:
   long_name: Conditional load immediate if great or equal than (Immediate)
   description: |
     Move `simm` to `rd` if the value in `rs1` is great or equal than value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------101-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeu.yaml
index 8c8ad877b..e4315f522 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeu.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.ligeu:
+qc.ligeu:
   long_name: Conditional load immediate if great or equal than unsigned (Register)
   description: |
     Move `simm` to `rd` if the unsigned value in `rs1` is great or equal than unsigned value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------111-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeui.yaml
index 3dfd06d2e..a1c2299e5 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.ligeui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.ligeui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.ligeui:
+qc.ligeui:
   long_name: Conditional load immediate if great or equal than unsigned (Immediate)
   description: |
     Move `simm` to `rd` if the unsigned value in `rs1` is great or equal than unsigned value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------111-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilt.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilt.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilt.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilt.yaml
index e0f5a228e..199dd2cae 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilt.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilt.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lilt:
+qc.lilt:
   long_name: Conditional load immediate if less than (Register)
   description: |
     Move `simm` to `rd` if the value in `rs1` is less than value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------100-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilti.yaml
index b359a3597..1c56b7e0a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lilti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lilti.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lilti:
+qc.lilti:
   long_name: Conditional load immediate if less than (Immediate)
   description: |
     Move `simm` to `rd` if the value in `rs1` is less than value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------100-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltu.yaml
index 4567bca8a..b5b9dfc73 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltu.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.liltu:
+qc.liltu:
   long_name: Conditional load immediate if less than unsigned (Register)
   description: |
     Move `simm` to `rd` if the unsigned value in `rs1` is less than unsigned value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------110-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltui.yaml
index f18df2f17..7c2806d88 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.liltui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.liltui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.liltui:
+qc.liltui:
   long_name: Conditional load immediate if less than unsigned (Immediate)
   description: |
     Move `simm` to `rd` if the unsigned value in `rs1` is less than unsigned value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------110-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.line.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.line.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.line.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.line.yaml
index 3e2f5faac..cd262b90b 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.line.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.line.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.line:
+qc.line:
   long_name: Conditional load immediate if not equal (Register)
   description: |
     Move `simm` to `rd` if the value in `rs1` is not equal to value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----01----------001-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.linei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.linei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.linei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.linei.yaml
index 5b45f8df3..f8fd3e1ac 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.linei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.linei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.linei:
+qc.linei:
   long_name: Conditional load immediate if not equal (Immediate)
   description: |
     Move `simm` to `rd` if the value in `rs1` is not equal to value `imm`
   definedBy:
-  - Xqciu
-  - Xqccli
+  - Xqci
+  - Xqcicli
   base: 32
   encoding:
     match:     -----11----------001-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrb.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrb.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrb.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrb.yaml
index 835a606c1..4fd619b14 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrb.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrb.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.lrb:
+qc.lrb:
   long_name: Load indexed byte
   description: |
     Load 8 bits of data into register `rd` from an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
     Sign extend the result.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xd, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrbu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrbu.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrbu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrbu.yaml
index 0a46ec223..a85fc125c 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrbu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrbu.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.lrbu:
+qc.lrbu:
   long_name: Load indexed unsigned byte
   description: |
     Load 8 bits of data into register `rd` from an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xd, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrh.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrh.yaml
index 4befa8e37..c2d98cdb2 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrh.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.lrh:
+qc.lrh:
   long_name: Load indexed halfword
   description: |
     Load 16 bits of data into register `rd` from an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
     Sign extend the result.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xd, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrhu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrhu.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrhu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrhu.yaml
index 9fa86769b..2a96f1023 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrhu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrhu.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.lrhu:
+qc.lrhu:
   long_name: Load indexed unsigned halfword
   description: |
     Load 16 bits of data into register `rd` from an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xd, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrw.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrw.yaml
similarity index 82%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrw.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrw.yaml
index 1795ad78a..41548af89 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lrw.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lrw.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.lrw:
+qc.lrw:
   long_name: Load indexed word
   description: |
-    Load 16 bits of data into register `rd` from an
+    Load 32 bits of data into register `rd` from an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
-  assembly: " xd, xs1, xs2, shamt"
+  definedBy:
+  - Xqci
+  - Xqcisls
+  assembly: xd, xs1, xs2, shamt
   base: 32
   encoding:
     match: 1010-------------111-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwm.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwm.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwm.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwm.yaml
index 1494d2063..fe219d183 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwm.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwm.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lwm:
+qc.lwm:
   long_name: Load word multiple
   description: |
     Loads multiple words starting from address (`rs1` + `imm`) to registers, starting from `rd`.
     The number of words is in `rs2`
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     00---------------111-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwmi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwmi.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwmi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwmi.yaml
index 29490c08b..5cdc5db2b 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.lwmi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.lwmi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.lwmi:
+qc.lwmi:
   long_name: Load word multiple (Immediate)
   description: |
     Loads multiple words starting from address (`rs1` + `imm`) to registers, starting from `rd`.
     The number of words is in the `length` immediate.
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     01---------------111-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mpyaddi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.muladdi.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mpyaddi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.muladdi.yaml
index e1bd147cd..a6b30f6c9 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mpyaddi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.muladdi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mpyaddi:
+qc.muladdi:
   long_name: Multiply and accumulate (Immediate)
   description: |
     Increments `rd` by the multiplication of `rs1` and a signed immediate `imm`
   definedBy:
-  - Xqciu
-  - Xqcac
+  - Xqci
+  - Xqciac
   base: 32
   encoding:
     match:     -----------------110-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveq.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveq.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveq.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveq.yaml
index 8db5627c1..a96433f8e 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveq.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveq.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mveq:
+qc.mveq:
   long_name: Conditional move if equal (Register)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is equal to value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------000-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveqi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveqi.yaml
index 02be889dd..46d67a0a5 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mveqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mveqi.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mveqi:
+qc.mveqi:
   long_name: Conditional move if equal (Immediate)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is equal to value of `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------000-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvge.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvge.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvge.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvge.yaml
index 38bc9a11f..9334da7c9 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvge.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvge.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvge:
+qc.mvge:
   long_name: Conditional move if great or equal than (Register)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is great or equal than value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------101-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgei.yaml
index 048213a08..2f3ffccb3 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvgei:
+qc.mvgei:
   long_name: Conditional move if great or equal than (Immediate)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is great or equal than value of `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------101-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeu.yaml
index b94e63b7a..8923b8f0a 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeu.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvgeu:
+qc.mvgeu:
   long_name: Conditional move if great or equal than unsigned (Register)
   description: |
     Move `rs3` to `rd` if the unsigned value in `rs1` is great or equal than unsigned value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------111-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeui.yaml
index 963d3e1cb..794823b08 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvgeui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvgeui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvgeui:
+qc.mvgeui:
   long_name: Conditional move if great or equal than unsigned (Immediate)
   description: |
     Move `rs3` to `rd` if the unsigned value in `rs1` is great or equal than unsigned value of `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------111-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlt.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlt.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlt.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlt.yaml
index 403f88926..4b54f8e8d 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlt.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlt.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvlt:
+qc.mvlt:
   long_name: Conditional move if less than (Register)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is less than value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------100-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlti.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlti.yaml
index 3ae3a63b4..a2e9a8c95 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvlti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvlti.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvlti:
+qc.mvlti:
   long_name: Conditional move if less than (Immediate)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is less than value of `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------100-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltu.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltu.yaml
index 116fc6a5a..91cf325b6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltu.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvltu:
+qc.mvltu:
   long_name: Conditional move if less than unsigned (Register)
   description: |
     Move `rs3` to `rd` if the unsigned value in `rs1` is less than unsigned value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------110-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltui.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltui.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltui.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltui.yaml
index 874391c4c..a69f4d329 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvltui.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvltui.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvltui:
+qc.mvltui:
   long_name: Conditional move if less than unsigned (Immediate)
   description: |
     Move `rs3` to `rd` if the unsigned value in `rs1` is less than unsigned value of `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------110-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvne.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvne.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvne.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvne.yaml
index caa6a008b..4965a21f4 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvne.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvne.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvne:
+qc.mvne:
   long_name: Conditional move if not equal (Register)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is not equal to value `rs2`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----00----------001-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvnei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvnei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvnei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvnei.yaml
index 1c4d03c6a..875bb10a6 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.mvnei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.mvnei.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.mvnei:
+qc.mvnei:
   long_name: Conditional move if not equal (Immediate)
   description: |
     Move `rs3` to `rd` if the value in `rs1` is not equal to value `imm`
   definedBy:
-  - Xqciu
-  - Xqccm
+  - Xqci
+  - Xqcicm
   base: 32
   encoding:
     match:     -----10----------001-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.norm.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.norm.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.norm.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.norm.yaml
index 4e051718d..84d2607b9 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.norm.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.norm.yaml
@@ -1,13 +1,15 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.norm:
+qc.norm:
   long_name: Signed Normalization
   description: |
     Signed normalization of `rs1`. 
     Exponent written in bits[7:0] of the result.
     Mantissa written in bits[31:8] of the result.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     000011100000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normeu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normeu.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normeu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normeu.yaml
index dca557146..c307a8771 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normeu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normeu.yaml
@@ -1,13 +1,15 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.normeu:
+qc.normeu:
   long_name: Unsigned Even Normalization
   description: |
     Unsigned even normalization of `rs1` (exponent is even). 
     Even exponent written in bits[7:0] of the result.
     Mantissa (based on even exponent) written in bits[31:8] of the result.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     000100100000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normu.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normu.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normu.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normu.yaml
index ceff0c464..58eb9ba21 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.normu.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.normu.yaml
@@ -1,13 +1,15 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.normu:
+qc.normu:
   long_name: Unsigned Normalization
   description: |
     Unsigned normalization of `rs1`. 
     Exponent written in bits[7:0] of the result.
     Mantissa written in bits[31:8] of the result.
     Write result to `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     000100000000-----011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selecteqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selecteqi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selecteqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selecteqi.yaml
index 436500da2..299375660 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selecteqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selecteqi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selecteqi:
+qc.selecteqi:
   long_name: Select load immediate or register if equal (Immediate)
   description: |
     Move `rs2` to `rd` if the value in `rd` is equal to value `imm`,
     move `rs3` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----10----------010-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieq.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieq.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieq.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieq.yaml
index 367a2a545..881c118e7 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieq.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieq.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectieq:
+qc.selectieq:
   long_name: Select load immediate or register if equal (Register)
   description: |
     Move `rs2` to `rd` if the value in `rd` is equal to value `rs1`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----01----------010-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieqi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieqi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieqi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieqi.yaml
index 933398c86..2312504bc 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectieqi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectieqi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectieqi:
+qc.selectieqi:
   long_name: Select load immediate or register if equal (Immediate)
   description: |
     Move `rs2` to `rd` if the value in `rd` is equal to value `imm`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----11----------010-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiieq.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiieq.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiieq.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiieq.yaml
index 945865afd..bb05d9fa1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiieq.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiieq.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectiieq:
+qc.selectiieq:
   long_name: Select load immediate if equal (Register)
   description: |
     Move `simm1` to `rd` if the value in `rd` is equal to value `rs1`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----00----------010-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiine.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiine.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiine.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiine.yaml
index 67acc778d..59df59ac9 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectiine.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectiine.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectiine:
+qc.selectiine:
   long_name: Select load immediate if not equal (Register)
   description: |
     Move `simm1` to `rd` if the value in `rd` is not equal to value `rs1`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----00----------011-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectine.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectine.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectine.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectine.yaml
index 26429aed5..31a35e47f 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectine.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectine.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectine:
+qc.selectine:
   long_name: Select load immediate or register if not equal (Register)
   description: |
     Move `rs2` to `rd` if the value in `rd` is not equal to value `rs1`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----01----------011-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectinei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectinei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectinei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectinei.yaml
index 201b48a7d..7ecb993d7 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectinei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectinei.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectinei:
+qc.selectinei:
   long_name: Select load immediate or register if not equal (Immediate)
   description: |
     Move `rs2` to `rd` if the value in `rd` is not equal to value `imm`,
     move `simm2` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----11----------011-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectnei.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectnei.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectnei.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectnei.yaml
index ef8a6133e..de9885219 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.selectnei.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.selectnei.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.selectnei:
+qc.selectnei:
   long_name: Select load immediate or register if not equal (Immediate)
   description: |
     Move `rs2` to `rd` if the value in `rd` is not equal to value `imm`,
     move `rs3` to `rd` otherwise
   definedBy:
-  - Xqciu
-  - Xqccs
+  - Xqci
+  - Xqcics
   base: 32
   encoding:
     match:     -----10----------011-----1011011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setinti.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setinti.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setinti.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setinti.yaml
index c08b41c39..b3585b920 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setinti.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setinti.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.setinti:
+qc.setinti:
   long_name: Set interrupt (Immediate)
   description: |
     Set interrupt, interrupt number is in `imm` (0 - 1023).
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqciint
   assembly: " imm"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwm.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwm.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwm.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwm.yaml
index da94f4b1b..b21642bbe 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwm.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwm.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.setwm:
+qc.setwm:
   long_name: Set word multiple (Register)
   description: |
     Stores the value of `rs3` multiple times into the address starting at (`rs1` + `imm`).
     The number of writes is in `rs2`.
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     10---------------111-----0101011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwmi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwmi.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwmi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwmi.yaml
index 44380dd78..959a12fd2 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.setwmi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.setwmi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.setwmi:
+qc.setwmi:
   long_name: Set word multiple (Immediate)
   description: |
     Stores the value of `rs3` multiple times into the address starting at (`rs1` + `imm`).
     The number of writes is in length.
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     11---------------111-----0101011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.shladd.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.shladd.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.shladd.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.shladd.yaml
index 152b32631..0a982628d 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.shladd.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.shladd.yaml
@@ -1,12 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.shladd:
+qc.shladd:
   long_name: Shift left and add (immediate)
   description: |
     Left shift _rs1_ by _shamt_ and add the value in _rs2_.
   definedBy:
-  - [Xqciu, ">= 0.2"]
-  - Xqcac
+  - [Xqci, ">= 0.2"]
+  - Xqciac
   base: 32
   encoding:
     match:     01---------------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.slasat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.slasat.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.slasat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.slasat.yaml
index ec4f5a652..3a219d8ff 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.slasat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.slasat.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.slasat:
+qc.slasat:
   long_name: Saturating arithmetic left shift
   description: |
     Left shift `rs1` by the value of `rs2`, and saturate the signed result.
     The number of words is in `length`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0001010----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sllsat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.sllsat.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sllsat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.sllsat.yaml
index 10a3aad29..192d229d7 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sllsat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.sllsat.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.sllsat:
+qc.sllsat:
   long_name: Saturating logical left shift
   description: |
     Left shift `rs1` by the value of `rs2`, and saturate the unsigned result.
     The number of words is in `length`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0001100----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srb.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srb.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srb.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srb.yaml
index 6ac7c7037..be0cfa031 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srb.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srb.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.srb:
+qc.srb:
   long_name: Store indexed byte
   description: |
     Store 8 bits of data from register `rs3` to an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xs3, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srh.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srh.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srh.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srh.yaml
index 73382338d..d337f50ac 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srh.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srh.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.srh:
+qc.srh:
   long_name: Store indexed halfword
   description: |
     Store 16 bits of data from register `rs3` to an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xs3, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srw.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srw.yaml
similarity index 94%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srw.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srw.yaml
index 45023df14..c8093e3e5 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.srw.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.srw.yaml
@@ -1,11 +1,13 @@
 # yaml-language-server: $schema=../../../schemas/inst_schema.json
 
-qc32.srw:
+qc.srw:
   long_name: Store indexed word
   description: |
     Store 32 bits of data from register `rs3` to an
     address formed by adding `rs1` to `rs2`, shifted by `shamt`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcisls
   assembly: " xs3, xs1, xs2, shamt"
   base: 32
   encoding:
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subsat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subsat.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subsat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subsat.yaml
index 2461bf890..58156e257 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subsat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subsat.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.subsat:
+qc.subsat:
   long_name: Saturating signed subtraction
   description: |
     Subtract signed values `rs1` and `rs2`, saturate the signed result, and write to `rd`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0010000----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subusat.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subusat.yaml
similarity index 93%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subusat.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subusat.yaml
index c0809e529..bab9f1358 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.subusat.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.subusat.yaml
@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.subusat:
+qc.subusat:
   long_name: Saturating unsigned subtraction
   description: |
     Subtract unsigned values `rs1` and `rs2`, saturate the unsigned result, and write to `rd`.
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0010001----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swm.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swm.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swm.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swm.yaml
index 86a5d6be1..1b2d1bab3 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swm.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swm.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.swm:
+qc.swm:
   long_name: Store word multiple
   description: |
     Stores multiple words from the registers starting at `rs3` to the address starting at (`rs1` + `imm`).
     The number of words is in `rs2`.
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     00---------------111-----0101011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swmi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swmi.yaml
similarity index 96%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swmi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swmi.yaml
index 2cb2d0e38..1d1b01842 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.swmi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.swmi.yaml
@@ -1,13 +1,13 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.swmi:
+qc.swmi:
   long_name: Store word multiple (immediate)
   description: |
     Stores multiple words from the registers starting at `rs3` to the address starting at (`rs1` + `imm`).
     The number of words is in `length` immediate.
   definedBy:
-  - Xqciu
-  - Xqclsm
+  - Xqci
+  - Xqcilsm
   base: 32
   encoding:
     match:     00---------------111-----0101011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrap.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrap.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrap.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrap.yaml
index bcc842098..c1127a3d2 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrap.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrap.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.wrap:
+qc.wrap:
   long_name: Wraparound (Register)
   description: |
     If `rs1` >= `rs2` perform subtraction between `rs1` and `rs2`.
     If `rs1` < 0, perform addition between `rs1` and `rs2`,
     else, select `rs1`. The result is stored in `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0010010----------011-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrapi.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrapi.yaml
similarity index 95%
rename from cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrapi.yaml
rename to cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrapi.yaml
index d56a3d928..6125132e1 100644
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.wrapi.yaml
+++ b/cfgs/qc_iu/arch_overlay/inst/Xqci/qc.wrapi.yaml
@@ -1,12 +1,14 @@
 # yaml-language-server: $schema=../../../../../schemas/inst_schema.json
 
-qc32.wrapi:
+qc.wrapi:
   long_name: Wraparound (Immediate)
   description: |
     If `rs1` >= `imm` perform subtraction between `rs1` and `imm`.
     If `rs1` < 0, perform addition between `rs1` and `imm`,
     else, select `rs1`. The result is stored in `rd`. 
-  definedBy: Xqciu
+  definedBy:
+  - Xqci
+  - Xqcia
   base: 32
   encoding:
     match:     0----------------000-----0001011
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh4add.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh4add.yaml
deleted file mode 100644
index 0f4a67eee..000000000
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh4add.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=../../../schemas/inst_schema.json
-
-qc32.sh4add:
-  long_name: Shift left by 4 and add
-  description: |
-    This instruction shifts `rs1` to the left by 4 bit and adds it to `rs2`.
-  definedBy:
-  - [Xqciu, "< 0.2"]
-  assembly: xd, xs1, xs2
-  base: 32
-  encoding:
-    match: 0010100----------011-----0001011
-    variables:
-    - name: rs2
-      location: 24-20
-      not: 0
-    - name: rs1
-      location: 19-15
-      not: 0
-    - name: rd
-      location: 11-7
-      not: 0
-  access:
-    s: always
-    u: always
-    vs: always
-    vu: always
-  operation(): |
-    X[rd] = X[rs2] + (X[rs1] << 4);
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh5add.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh5add.yaml
deleted file mode 100644
index 141e6fcfe..000000000
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh5add.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=../../../schemas/inst_schema.json
-
-qc32.sh5add:
-  long_name: Shift left by 5 and add
-  description: |
-    This instruction shifts `rs1` to the left by 5 bit and adds it to `rs2`.
-  definedBy:
-  - [Xqciu, "< 0.2"]
-  assembly: xd, xs1, xs2
-  base: 32
-  encoding:
-    match: 0010101----------011-----0001011
-    variables:
-    - name: rs2
-      location: 24-20
-      not: 0
-    - name: rs1
-      location: 19-15
-      not: 0
-    - name: rd
-      location: 11-7
-      not: 0
-  access:
-    s: always
-    u: always
-    vs: always
-    vu: always
-  operation(): |
-    X[rd] = X[rs2] + (X[rs1] << 5);
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh6add.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh6add.yaml
deleted file mode 100644
index a403c9f24..000000000
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh6add.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=../../../schemas/inst_schema.json
-
-qc32.sh6add:
-  long_name: Shift left by 6 and add
-  description: |
-    This instruction shifts `rs1` to the left by 6 bit and adds it to `rs2`.
-  definedBy:
-  - [Xqciu, "< 0.2"]
-  assembly: xd, xs1, xs2
-  base: 32
-  encoding:
-    match: 0010110----------011-----0001011
-    variables:
-    - name: rs2
-      location: 24-20
-      not: 0
-    - name: rs1
-      location: 19-15
-      not: 0
-    - name: rd
-      location: 11-7
-      not: 0
-  access:
-    s: always
-    u: always
-    vs: always
-    vu: always
-  operation(): |
-    X[rd] = X[rs2] + (X[rs1] << 6);
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh7add.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh7add.yaml
deleted file mode 100644
index a7f552853..000000000
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh7add.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=../../../schemas/inst_schema.json
-
-qc32.sh7add:
-  long_name: Shift left by 7 and add
-  description: |
-    This instruction shifts `rs1` to the left by 7 bit and adds it to `rs2`.
-  definedBy:
-  - [Xqciu, "< 0.2"]
-  assembly: xd, xs1, xs2
-  base: 32
-  encoding:
-    match: 0010111----------011-----0001011
-    variables:
-    - name: rs2
-      location: 24-20
-      not: 0
-    - name: rs1
-      location: 19-15
-      not: 0
-    - name: rd
-      location: 11-7
-      not: 0
-  access:
-    s: always
-    u: always
-    vs: always
-    vu: always
-  operation(): |
-    X[rd] = X[rs2] + (X[rs1] << 7);
\ No newline at end of file
diff --git a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh8add.yaml b/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh8add.yaml
deleted file mode 100644
index 0cc4723e4..000000000
--- a/cfgs/qc_iu/arch_overlay/inst/Xqciu/qc32.sh8add.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# yaml-language-server: $schema=../../../schemas/inst_schema.json
-
-qc32.sh8add:
-  long_name: Shift left by 8 and add
-  description: |
-    This instruction shifts `rs1` to the left by 8 bit and adds it to `rs2`.
-  definedBy:
-  - [Xqciu, "< 0.2"]
-  assembly: xd, xs1, xs2
-  base: 32
-  encoding:
-    match: 0011000----------011-----0001011
-    variables:
-    - name: rs2
-      location: 24-20
-      not: 0
-    - name: rs1
-      location: 19-15
-      not: 0
-    - name: rd
-      location: 11-7
-      not: 0
-  access:
-    s: always
-    u: always
-    vs: always
-    vu: always
-  operation(): |
-    X[rd] = X[rs2] + (X[rs1] << 8);
\ No newline at end of file
diff --git a/schemas/arch_schema.json b/schemas/arch_schema.json
index 63de02d59..47b5e1998 100644
--- a/schemas/arch_schema.json
+++ b/schemas/arch_schema.json
@@ -64,7 +64,7 @@
       "type": "array",
       "items": {
         "type": "string",
-        "pattern": "^[a-z][a-zA-Z0-9]+$",
+        "pattern": "^[a-z][a-zA-Z0-9.]+$",
         "description": "CSR name"
       }
     },
diff --git a/schemas/csr_schema.json b/schemas/csr_schema.json
index 74c61fb85..cac68fd17 100644
--- a/schemas/csr_schema.json
+++ b/schemas/csr_schema.json
@@ -307,7 +307,7 @@
     "misa:\\n  long_name: Machine ISA Control\\n  address: 0x301\\n  priv_mode: M\\n  length: 64\\n  description: Reports the XLEN and 'major' extensions supported by the ISA.\\n  definedBy: I\\n  fields:\\n    MXL:\\n      location: 63-62\\n      description: XLEN in M-mode.\\n      type: RO\\n      value: 2\\n    Extensions:      location: 25-0\\n      description: |\\n        Indicates support for major (single letter) ISA extensions.\\n\\n        Value corresponds to A, D, F, H, I, M, S, U\\n      type: RO\\n      value: 0x1411A9"
   ],
   "patternProperties": {
-    "^[a-z][a-z0-9A-Z]+$": {
+    "^[a-z][a-z0-9A-Z.]+$": {
       "description": "CSR name",
       "$ref": "#/$defs/csr_register"
     }