Fix use of (COL|ROW)_NAME macros to compute numbers from names.