Followed NED renames in tests.