--- a/src/OPERATORS/op-s-m.cc
+++ b/src/OPERATORS/op-s-m.cc
@@ -98,28 +98,28 @@
 void
 install_s_m_ops (void)
 {
-  INSTALL_BINOP (add, octave_scalar, octave_matrix, add);
-  INSTALL_BINOP (sub, octave_scalar, octave_matrix, sub);
-  INSTALL_BINOP (mul, octave_scalar, octave_matrix, mul);
-  INSTALL_BINOP (div, octave_scalar, octave_matrix, div);
-  INSTALL_BINOP (pow, octave_scalar, octave_matrix, pow);
-  INSTALL_BINOP (ldiv, octave_scalar, octave_matrix, ldiv);
-  INSTALL_BINOP (lt, octave_scalar, octave_matrix, lt);
-  INSTALL_BINOP (le, octave_scalar, octave_matrix, le);
-  INSTALL_BINOP (eq, octave_scalar, octave_matrix, eq);
-  INSTALL_BINOP (ge, octave_scalar, octave_matrix, ge);
-  INSTALL_BINOP (gt, octave_scalar, octave_matrix, gt);
-  INSTALL_BINOP (ne, octave_scalar, octave_matrix, ne);
-  INSTALL_BINOP (el_mul, octave_scalar, octave_matrix, el_mul);
-  INSTALL_BINOP (el_div, octave_scalar, octave_matrix, el_div);
-  INSTALL_BINOP (el_pow, octave_scalar, octave_matrix, el_pow);
-  INSTALL_BINOP (el_ldiv, octave_scalar, octave_matrix, el_ldiv);
-  INSTALL_BINOP (el_and, octave_scalar, octave_matrix, el_and);
-  INSTALL_BINOP (el_or, octave_scalar, octave_matrix, el_or);
+  INSTALL_BINOP (op_add, octave_scalar, octave_matrix, add);
+  INSTALL_BINOP (op_sub, octave_scalar, octave_matrix, sub);
+  INSTALL_BINOP (op_mul, octave_scalar, octave_matrix, mul);
+  INSTALL_BINOP (op_div, octave_scalar, octave_matrix, div);
+  INSTALL_BINOP (op_pow, octave_scalar, octave_matrix, pow);
+  INSTALL_BINOP (op_ldiv, octave_scalar, octave_matrix, ldiv);
+  INSTALL_BINOP (op_lt, octave_scalar, octave_matrix, lt);
+  INSTALL_BINOP (op_le, octave_scalar, octave_matrix, le);
+  INSTALL_BINOP (op_eq, octave_scalar, octave_matrix, eq);
+  INSTALL_BINOP (op_ge, octave_scalar, octave_matrix, ge);
+  INSTALL_BINOP (op_gt, octave_scalar, octave_matrix, gt);
+  INSTALL_BINOP (op_ne, octave_scalar, octave_matrix, ne);
+  INSTALL_BINOP (op_el_mul, octave_scalar, octave_matrix, el_mul);
+  INSTALL_BINOP (op_el_div, octave_scalar, octave_matrix, el_div);
+  INSTALL_BINOP (op_el_pow, octave_scalar, octave_matrix, el_pow);
+  INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_matrix, el_ldiv);
+  INSTALL_BINOP (op_el_and, octave_scalar, octave_matrix, el_and);
+  INSTALL_BINOP (op_el_or, octave_scalar, octave_matrix, el_or);
 
   INSTALL_ASSIGNCONV (octave_scalar, octave_matrix, octave_matrix);
 
-  INSTALL_WIDENOP (octave_scalar, octave_matrix, matrix_conv);
+  INSTALL_WIDENOP (op_octave_scalar, octave_matrix, matrix_conv);
 }
 
 /*