Naming changes in test code