Update classes names for table for reading clarity