Make naming consistent in tests