Minor rename test tweaks for clarity.