Revert reuse of eq/ne and rename again