With the renaming, I have introduced some compilations errors. Here I am simply fixing them.
Checking pipeline status.
Merge details
added Cleanup label
merged
mentioned in commit 4746f6e1