Fix expectation names