Made naming of RowKey format more consistent