Undo some aggressive find/replace.
Making more tests pass