Adjusting tests to new name escapes.