Rename classes in tests