Refs #21485; Added renaming of columns & rows