Simple rename/restructure to allow for upcoming test additions.
This is a backport of [[https://github.com/bitcoin/bitcoin/pull/19725 | core#19725]] [3/5]
https://github.com/bitcoin/bitcoin/pull/19725/commits/df091b9b509f0b10e4315c0bfa2da0cc0c31c22f
Depends on D10372