Rename some test harness method names