Rename folks in tests