Renamed colspan, rowspan to cols, rows