https://codereview.appspot.com/72460044/diff/40001/src/main/webapp/jsp/instru... File src/main/webapp/jsp/instructorFeedbackResultsByTable.jsp (right): https://codereview.appspot.com/72460044/diff/40001/src/main/webapp/jsp/instru... src/main/webapp/jsp/instructorFeedbackResultsByTable.jsp:81: recipientName = data.bundle.appendTeamNameToName(recipientName, recipientTeamName); one indentation too many? https://codereview.appspot.com/72460044/diff/40001/src/main/webapp/jsp/instru... File src/main/webapp/jsp/instructorStudentRecords.jsp (right): https://codereview.appspot.com/72460044/diff/40001/src/main/webapp/jsp/instru... src/main/webapp/jsp/instructorStudentRecords.jsp:220: giverName = recipientName = feedback.appendTeamNameToName(data.student.name, data.student.team); Don't assign things to multiple variables at the same time as it might be missed during future edits https://codereview.appspot.com/72460044/diff/40001/src/test/java/teammates/te... File src/test/java/teammates/test/cases/logic/FeedbackSessionsLogicTest.java (right): https://codereview.appspot.com/72460044/diff/40001/src/test/java/teammates/te... src/test/java/teammates/test/cases/logic/FeedbackSessionsLogicTest.java:630: } What about when the recipient is None/instructors?