REFACTOR Name change

The "_index" in "row_index" and "column_index" does not provide extra
meaning, and is deleted.