Made sure the component models were kept in sync with the row class name changes