Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -rfba7287887f6dd83d3098100af6320cccf1f3e36 -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fba7287887f6dd83d3098100af6320cccf1f3e36)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
@@ -63,10 +63,10 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
-		function scratchImage(itemUid, answerUid, isCorrect) {
+		function scratchImage(itemUid, optionUid, isCorrect) {
 			// first show animation, then put static image
 			var imageSuffix = isCorrect ? 'correct' : 'wrong';
-	    		$('#image-' + itemUid + '-' + answerUid).load(function(){
+	    		$('#image-' + itemUid + '-' + optionUid).load(function(){
 	    			var image = $(this).off("load");
 	    			// show static image after animation
 	    			setTimeout(
@@ -78,27 +78,27 @@
 	    		}).attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + "-animation.gif");
 		}
 
-		function scratchItem(itemUid, answerUid){
+		function scratchItem(itemUid, optionUid){
 	        $.ajax({
 	            url: '<c:url value="/learning/recordItemScratched.do"/>',
-	            data: 'sessionMapID=${sessionMapID}&answerUid=' + answerUid + '&itemUid=' + itemUid,
+	            data: 'sessionMapID=${sessionMapID}&optionUid=' + optionUid + '&itemUid=' + itemUid,
 	            dataType: 'json',
 	            type: 'post',
 	            success: function (json) {
 		            	if (json == null) {
 		            		return false;
 		            	}
 		            	
-		            	scratchImage(itemUid, answerUid, json.answerCorrect);
+		            	scratchImage(itemUid, optionUid, json.optionCorrect);
 		            	
-		            	if (json.answerCorrect) {
+		            	if (json.optionCorrect) {
 		            		//disable scratching
 		            		$("[id^=imageLink-" + itemUid + "]").removeAttr('onclick'); 
 		            		$("[id^=imageLink-" + itemUid + "]").css('cursor','default');
 		            		$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
 
 		            	} else {
-		            		var id = '-' + itemUid + '-' + answerUid;
+		            		var id = '-' + itemUid + '-' + optionUid;
 		            		$('#imageLink' + id).removeAttr('onclick');
 		            		$('#imageLink' + id).css('cursor','default');
 		            	}