Confusion of Axi4Full Testcases

Hi,
with my marriage (see “https://osvvm.org/forums/topic/using-vcs-without-the-built-in-scripts”) of OSVVM and VUNIT I found a confusion in the TbAXI4_[AXI?]ManagerRandomTiming Testcase:

——————————————————-
TbAxi4_ManagerRandomTiming1 :
architecture: ManagerRandomTiming1
…
Configuration TbAxi4_ManagerRandomTiming1 of TbAxi4Memory is
for TestHarness
for TestCtrl_1 : TestCtrl
use entity work.TestCtrl(ManagerRandomTiming1) ;

——————————————————-
TbAxi4_AXIManagerRandomTiming1 :
architecture ManagerRandomTiming1 of TestCtrl is — <- should named AxiManagerRandomTiming1
…
Configuration TbAxi4_AxiManagerRandomTiming1 of TbAxi4Memory is
for TestHarness
for TestCtrl_1 : TestCtrl
use entity work.TestCtrl(ManagerRandomTiming1) ; — <- includes the last compiled architecture, should named AxiManagerRandomTiming1

——————————————————-
In the TbAxi4_AxiManagerRandomTiming2 is the configuration without the AXI in the architecture name, too:
Configuration TbAxi4_AxiManagerRandomTiming2 of TbAxi4Memory is
for TestHarness
for TestCtrl_1 : TestCtrl
use entity work.TestCtrl(ManagerRandomTiming2) ; — <- should named AxiManagerRandomTiming2