Index: lams_learning/web/includes/javascript/presence.js
===================================================================
diff -u -r88272da28c18de62ade94eafc89f974ef50c3b29 -r83811002f3d39ce647ddfe30f9371ad10bd499af
--- lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 88272da28c18de62ade94eafc89f974ef50c3b29)
+++ lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 83811002f3d39ce647ddfe30f9371ad10bd499af)
@@ -92,11 +92,11 @@
 	},
 	
 	// init the connection with server using server URL but with different protocol
-	websocket = new WebSocket(APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId + 
+	presenceWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId + 
 															   '&imEnabled=' + presenceImEnabled + '&nickname=' + encodeURIComponent(nickname));
 
 // when the server pushes new messages and roster to the learner's browser
-websocket.onmessage = function(e){
+presenceWebsocket.onmessage = function(e){
 	// create JSON object
   var input = JSON.parse(e.data);
   if (input.roster) {
@@ -212,7 +212,7 @@
 		 'to'       : nick
 		};
 	
-	websocket.send(JSON.stringify(data));
+	presenceWebsocket.send(JSON.stringify(data));
 	
 	return tab;
 }
@@ -274,7 +274,7 @@
 		 'message'  : message
 		};
 	
-	websocket.send(JSON.stringify(data));
+	presenceWebsocket.send(JSON.stringify(data));
 }
 
 /* ******* Click handlers ******* */
Index: lams_tool_chat/web/includes/javascript/learning.js
===================================================================
diff -u -rab2b6923490ce38dc647ea66d6768966fbc40cfd -r83811002f3d39ce647ddfe30f9371ad10bd499af
--- lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision ab2b6923490ce38dc647ea66d6768966fbc40cfd)
+++ lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 83811002f3d39ce647ddfe30f9371ad10bd499af)
@@ -10,7 +10,7 @@
 	sendMessageArea.keydown(function(e) {
 		if (e.which == 13) {
 			e.preventDefault();
-			sendMessage();
+			sendChatToolMessage();
 		}
 	});
 });
@@ -21,9 +21,9 @@
 	// only Monitor can send a personal message
 	selectedUser = null,
 	// init the connection with server using server URL but with different protocol
-	websocket = new WebSocket(APP_URL.replace('http', 'ws') + 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID);
+	chatToolWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID);
 
-websocket.onmessage = function(e){
+chatToolWebsocket.onmessage = function(e){
 	// create JSON object
 	var input = JSON.parse(e.data);
 	// clear old messages
@@ -65,7 +65,7 @@
 	});
 }
 
-websocket.onerror = function(e){
+chatToolWebsocket.onerror = function(e){
 	alert("Error estabilishing connection to server: " + e.data);
 }
 
@@ -84,7 +84,7 @@
 	userDiv.attr('class', selectedUser ? 'selected' : 'unselected');
 }
 
-function sendMessage() {
+function sendChatToolMessage() {
 	var message = sendMessageArea.val();
 	if (!message || message == '') {
 		return false;  // do not send empty messages.
@@ -100,7 +100,7 @@
 		};
 	
 	// send it to server
-	websocket.send(JSON.stringify(output)); 
+	chatToolWebsocket.send(JSON.stringify(output)); 
 }
 
 function getColour(nick) {
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -ref13258732b950074ce269abe8f51fbc00762eca -r83811002f3d39ce647ddfe30f9371ad10bd499af
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ef13258732b950074ce269abe8f51fbc00762eca)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 83811002f3d39ce647ddfe30f9371ad10bd499af)
@@ -71,7 +71,7 @@
 			</div>
 			<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2 ">
 				<div id="sendMessageButtonCell" class="voffset5">
-					<input id="sendMessageButton" class="btn btn-sm btn-default" type="button" onclick="javascript:sendMessage()"
+					<input id="sendMessageButton" class="btn btn-sm btn-default" type="button" onclick="javascript:sendChatToolMessage()"
 						value='<fmt:message key="button.send"/>' />
 				</div>
 			</div>