Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/dto/MdlChoiceOutputDTO.java
===================================================================
diff -u -r5cac3e40e8b15196f759f931882840203348af6d -r47de0a7602b9baa8435fbe90d5c0e16e1f41ae95
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/dto/MdlChoiceOutputDTO.java	(.../MdlChoiceOutputDTO.java)	(revision 5cac3e40e8b15196f759f931882840203348af6d)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/dto/MdlChoiceOutputDTO.java	(.../MdlChoiceOutputDTO.java)	(revision 47de0a7602b9baa8435fbe90d5c0e16e1f41ae95)
@@ -30,26 +30,26 @@
  */
 public class MdlChoiceOutputDTO {
     
-    private long id;
+    private long orderId;
     private String choice;
     
     public MdlChoiceOutputDTO() {
 	super();
 	// TODO Auto-generated constructor stub
     }
 
-    public MdlChoiceOutputDTO(long id, String choice) {
+    public MdlChoiceOutputDTO(long orderId, String choice) {
 	super();
-	this.id = id;
+	this.orderId = orderId;
 	this.choice = choice;
     }
 
-    public long getId() {
-        return id;
+    public long getOrderId() {
+        return orderId;
     }
 
-    public void setId(long id) {
-        this.id = id;
+    public void setOrderId(long orderId) {
+        this.orderId = orderId;
     }
 
     public String getChoice() {
Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceOutputFactory.java
===================================================================
diff -u -r7a10d149f243fd4df6f17cf754f1a35b7cb483e5 -r47de0a7602b9baa8435fbe90d5c0e16e1f41ae95
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceOutputFactory.java	(.../MdlChoiceOutputFactory.java)	(revision 7a10d149f243fd4df6f17cf754f1a35b7cb483e5)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceOutputFactory.java	(.../MdlChoiceOutputFactory.java)	(revision 47de0a7602b9baa8435fbe90d5c0e16e1f41ae95)
@@ -73,7 +73,7 @@
 
 		    int order = 1;
 		    for (MdlChoiceOutputDTO dto : choices) {
-			String name = buildConditionName(LEARNER_CHOICE_OUTPUT, "" + dto.getId());
+			String name = buildConditionName(LEARNER_CHOICE_OUTPUT, "" + dto.getOrderId());
 			defaultConditions.add(new BranchCondition(null, null, new Integer(order++), name, dto.getChoice(),
 				OutputType.OUTPUT_BOOLEAN.toString(), null, null, Boolean.TRUE.toString()));
 			order++;
@@ -132,10 +132,10 @@
 	}
 	
 	String choiceOutputName = "";
-	String choiceId = "";
+	String choiceOrderId = "";
 	try {
 	    choiceOutputName = dcNames[0];
-	    choiceId = dcNames[1];
+	    choiceOrderId = dcNames[1];
 	} catch (Exception e) {
 	    log.error("Problem retrieving outputs"
 		    + LEARNER_CHOICE_OUTPUT
@@ -146,7 +146,7 @@
 	if (userId != null) {
 	    
 	    return mdlChoiceService.getExternalToolOutputBoolean(choiceOutputName, mdlChoice, userId, extToolContentId,
-			toolSessionId, choiceId); 
+			toolSessionId, choiceOrderId); 
 	}
 	return false;
     }
Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java
===================================================================
diff -u -r7a10d149f243fd4df6f17cf754f1a35b7cb483e5 -r47de0a7602b9baa8435fbe90d5c0e16e1f41ae95
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java	(.../MdlChoiceService.java)	(revision 7a10d149f243fd4df6f17cf754f1a35b7cb483e5)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/service/MdlChoiceService.java	(.../MdlChoiceService.java)	(revision 47de0a7602b9baa8435fbe90d5c0e16e1f41ae95)
@@ -263,7 +263,7 @@
     }
 
     public boolean getExternalToolOutputBoolean(String outputName, MdlChoice mdlChoice, Long userId, String extToolContentId,
-	    Long toolSessionId, String optionID) {
+	    Long toolSessionId, String choiceOrderId) {
 	MdlChoiceUser user = this.getUserByUserIdAndSessionId(userId, toolSessionId);
 	ExtServerOrgMap extServerMap = getExtServerOrgMap();
 
@@ -279,7 +279,7 @@
 	    params.put(EXT_SERVER_PARAM_EXT_TOOL_CONTENT_ID, extToolContentId);
 	    params.put(EXT_SERVER_PARAM_METHOD, EXT_SERVER_METHOD_OUTPUT);
 	    params.put(EXT_SERVER_PARAM_OUTPUT_NAME, URLEncoder.encode(outputName, "UTF8"));
-	    params.put("optionID", URLEncoder.encode(optionID, "UTF8"));
+	    params.put("orderID", URLEncoder.encode(choiceOrderId, "UTF8"));
 
 	    InputStream is = WebUtility.getResponseInputStreamFromExternalServer(outputServletUrl, params);
 	    BufferedReader isReader = new BufferedReader(new InputStreamReader(is));
@@ -395,7 +395,7 @@
 	    for (int i = 0; i < list.getLength(); i++) {
 		NamedNodeMap markerNode = ((Node) list.item(i)).getAttributes();
 		String choice = markerNode.getNamedItem("option").getNodeValue();
-		long id = Long.parseLong(markerNode.getNamedItem("optionID").getNodeValue());
+		long id = Long.parseLong(markerNode.getNamedItem("orderID").getNodeValue());
 		MdlChoiceOutputDTO dto = new MdlChoiceOutputDTO(id, choice);
 		choices.add(dto);
 	    }