Tweaking test program names for clarity.