Revert "Undo name change in C++ tests for now"

This reverts commit 80df115beb351e9a58a6f909c28aab5f603c0a3c.