Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
===================================================================
diff -u -rcde8c481e618581dcb2279191ef0b163e9abb80b -r4243b50f5bfd45ca2feffa537be87c6ea02249b2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision cde8c481e618581dcb2279191ef0b163e9abb80b)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision 4243b50f5bfd45ca2feffa537be87c6ea02249b2)
@@ -347,8 +347,8 @@
 		+ " INNER JOIN lams_user user ON ug.user_id=user.user_id WHERE lesson.lesson_id = :lessonId "
 		+ " AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id "
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
-		+ "ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ "ORDER BY CONCAT(user.first_name, ' ', user.last_name) " + sortOrder;
 
 	//when :sortBy='timeTaken'
 	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN = "SELECT DISTINCT user.* "
@@ -358,7 +358,7 @@
 		+ " ON progress.user_id=user.user_id AND progress.lesson_id=:lessonId "
 		+ " WHERE lesson.lesson_id = :lessonId AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id"
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ "ORDER BY TIMEDIFF(progress.finish_date_time, progress.start_date_time) " + sortOrder;
 
 	//when :sortBy='mark'
@@ -369,7 +369,7 @@
 		+ " ON user.user_id=gradebookUserLesson.user_id AND gradebookUserLesson.lesson_id =:lessonId "
 		+ " WHERE lesson.lesson_id = :lessonId AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id"
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ " ORDER BY gradebookUserLesson.mark " + sortOrder;
 
 	//when :sortBy='feedback'
@@ -380,7 +380,7 @@
 		+ " ON user.user_id=gradebookUserLesson.user_id AND gradebookUserLesson.lesson_id =:lessonId "
 		+ " WHERE lesson.lesson_id = :lessonId AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id"
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ " ORDER BY gradebookUserLesson.feedback " + sortOrder;
 
 	String queryString;
@@ -415,8 +415,8 @@
 		+ " FROM lams_lesson lesson, lams_grouping gi, lams_group g, lams_user_group ug "
 		+ " INNER JOIN lams_user user ON ug.user_id=user.user_id  WHERE lesson.lesson_id = :lessonId "
 		+ " AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id AND ug.group_id=g.group_id"
-		+ " AND ug.group_id <> gi.staff_group_id AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
-		+ " ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
+		+ " AND ug.group_id <> gi.staff_group_id AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " ORDER BY CONCAT(user.first_name, ' ', user.last_name) " + sortOrder;
 
 	//when :sortBy='timeTaken'
 	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_ACTIVITY = "SELECT DISTINCT user.* "
@@ -428,7 +428,7 @@
 		+ " AND completedActivityProgress.activity_id=:activityId  ON progress.user_id=user.user_id "
 		+ " WHERE lesson.lesson_id = :lessonId AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id "
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ "ORDER BY TIMEDIFF(completedActivityProgress.completed_date_time, completedActivityProgress.start_date_time) "
 		+ sortOrder;
 
@@ -440,7 +440,7 @@
 		+ " ON user.user_id=gradebookUserActivity.user_id AND gradebookUserActivity.activity_id =:activityId "
 		+ " WHERE lesson.lesson_id = :lessonId AND lesson.class_grouping_id=gi.grouping_id AND gi.grouping_id=g.grouping_id "
 		+ " AND ug.group_id=g.group_id AND ug.group_id <> gi.staff_group_id"
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ "ORDER BY gradebookUserActivity.mark " + sortOrder;
 
 	String queryString;
@@ -474,8 +474,8 @@
 
 	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT DISTINCT user.* " + " FROM lams_user_group ug "
 		+ " INNER JOIN lams_user user ON ug.user_id=user.user_id " + " WHERE ug.group_id=:groupId "
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
-		+ " ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " ORDER BY CONCAT(user.first_name, ' ', user.last_name) " + sortOrder;
 
 	//when :sortBy='timeTaken'
 	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_GROUP = "SELECT DISTINCT user.* " + " FROM lams_user_group ug "
@@ -485,7 +485,7 @@
 		+ " ON completedActivityProgress.learner_progress_id=progress.learner_progress_id "
 		+ " AND completedActivityProgress.activity_id=:activityId " + " ON progress.user_id=user.user_id "
 		+ " WHERE ug.group_id=:groupId "
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ " ORDER BY TIMEDIFF(completedActivityProgress.completed_date_time, completedActivityProgress.start_date_time) "
 		+ sortOrder;
 
@@ -495,7 +495,7 @@
 		+ " LEFT OUTER JOIN lams_gradebook_user_activity gradebookUserActivity "
 		+ " ON user.user_id=gradebookUserActivity.user_id AND gradebookUserActivity.activity_id =:activityId "
 		+ " WHERE ug.group_id=:groupId "
-		+ " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) "
+		+ " AND (CONCAT(user.first_name, ' ', user.last_name) LIKE CONCAT('%', :searchString, '%')) "
 		+ "ORDER BY gradebookUserActivity.mark " + sortOrder;
 
 	String queryString;
@@ -543,8 +543,8 @@
 
 	final String LOAD_LEARNERS_BY_ORG = "SELECT uo.user FROM UserOrganisation uo INNER JOIN uo.userOrganisationRoles roles"
 		+ " WHERE uo.organisation.organisationId=:orgId AND roles.role.name = '" + Role.LEARNER + "'"
-		+ " AND CONCAT(uo.user.lastName, ' ', uo.user.firstName) LIKE CONCAT('%', :searchString, '%') "
-		+ " ORDER BY uo.user.lastName " + sortOrder + " , uo.user.firstName " + sortOrder;
+		+ " AND CONCAT(uo.user.firstName, ' ', uo.user.lastName) LIKE CONCAT('%', :searchString, '%') "
+		+ " ORDER BY uo.user.firstName " + sortOrder + ", uo.user.lastName " + sortOrder;
 
 	Query<User> query = getSession().createQuery(LOAD_LEARNERS_BY_ORG, User.class);
 	query.setParameter("orgId", orgId);
@@ -561,7 +561,7 @@
 	final String COUNT_LEARNERS_BY_ORG = "SELECT COUNT(uo.user) FROM UserOrganisation uo"
 		+ " INNER JOIN uo.userOrganisationRoles roles"
 		+ " WHERE uo.organisation.organisationId=:orgId AND roles.role.name = '" + Role.LEARNER + "'"
-		+ " AND CONCAT(uo.user.lastName, ' ', uo.user.firstName) LIKE CONCAT('%', :searchString, '%') ";
+		+ " AND CONCAT(uo.user.firstName, ' ', uo.user.lastName) LIKE CONCAT('%', :searchString, '%') ";
 
 	// support for custom search from a toolbar
 	searchString = searchString == null ? "" : searchString;
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
diff -u -rbfa7dfb5557d54767b137652b34dd89c13fb1227 -r4243b50f5bfd45ca2feffa537be87c6ea02249b2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision bfa7dfb5557d54767b137652b34dd89c13fb1227)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision 4243b50f5bfd45ca2feffa537be87c6ea02249b2)
@@ -51,7 +51,7 @@
 
     public GBUserGridRowDTO(User user) {
 	this.id = user.getUserId().toString();
-	this.rowName = HtmlUtils.htmlEscape(user.getLastName() + ", " + user.getFirstName());
+	this.rowName = HtmlUtils.htmlEscape(user.getFirstName() + " " + user.getLastName());
 	this.firstName = user.getFirstName();
 	this.lastName = user.getLastName();
 	this.login = user.getLogin();