fix NEQ operand + fix naming convention