diff --git a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveDayEvents.get.js b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveDayEvents.get.js
index 62d30fdcfb..c0f29532ca 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveDayEvents.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveDayEvents.get.js
@@ -72,7 +72,7 @@ function getEvents(eventdate) {
      }
      for (var i=0; i<space.children.length; i++) {
 	var child = space.children[i];
-	if (child.type=="{com.infoaxon.alfresco.calendar}calendarEvent") {
+	if (child.type=="{http://www.alfresco.org/model/calendar}calendarEvent") {
                if (datestr == child.properties["ia:fromDate"].toDateString()) {
 		 var startdate = child.properties["ia:fromDate"];
 		 var enddate = child.properties["ia:toDate"];
diff --git a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveMonthEvents.get.js b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveMonthEvents.get.js
index 259dd0a048..ff517b791c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveMonthEvents.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveMonthEvents.get.js
@@ -82,7 +82,7 @@ function getDayEvents(requiredDate) {
 		for (var i=0; i<currentSpace.children.length; i++)
 		{
 			var child = currentSpace.children[i];
-			if (child.type=="{com.infoaxon.alfresco.calendar}calendarEvent")
+			if (child.type=="{http://www.alfresco.org/model/calendar}calendarEvent")
 			{
 				var fromDate = new Date(child.properties["ia:fromDate"]);
 				fromDate.setHours(0,0,0,0);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveWeekEvents.get.js b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveWeekEvents.get.js
index aa007d0c07..819d35b30f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveWeekEvents.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/calendar/RetrieveWeekEvents.get.js
@@ -113,7 +113,7 @@ function getDayEvents(requiredDate, requiredTime)
 		{
 			var child = currentSpace.children[i];
 			var times = requiredTime.split(":");
-			if (child.type=="{com.infoaxon.alfresco.calendar}calendarEvent") {
+			if (child.type=="{http://www.alfresco.org/model/calendar}calendarEvent") {
 				var fromDate = new Date(child.properties["ia:fromDate"]);
 				fromDate.setHours(0,0,0,0);
 				var toDate = new Date(child.properties["ia:toDate"]);
@@ -154,7 +154,7 @@ function getAllDayEvents(requiredDate)
 		for (var i=0; i<currentSpace.children.length; i++)
 		{
 			var child = currentSpace.children[i];
-			if (child.type=="{com.infoaxon.alfresco.calendar}calendarEvent")
+			if (child.type=="{http://www.alfresco.org/model/calendar}calendarEvent")
 			{
 				var fromDate = new Date(child.properties["ia:fromDate"]);
 				fromDate.setHours(0,0,0,0);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/calendar/calendarInit.get.js b/config/alfresco/templates/webscripts/org/alfresco/calendar/calendarInit.get.js
index af5893c02a..6471dc0ec3 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/calendar/calendarInit.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/calendar/calendarInit.get.js
@@ -33,7 +33,7 @@ if (subscriptions == null) {
 model.subscriptions = subscriptions;
 
 // perform search
-var nodes = search.luceneSearch('TYPE:\"{com.infoaxon.alfresco.calendar}calendar\"');
+var nodes = search.luceneSearch('TYPE:\"{http\://www.alfresco.org/model/calendar}calendar\"');
 
 /**
 var filtered = new Array();
@@ -50,7 +50,4 @@ var filtered = new Array();
    }
 **/
 
-model.available = nodes;
-
-
-
+model.available = nodes;
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
index 07ba23c03a..5683a82417 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.js
@@ -20,7 +20,7 @@ function getEvents(siteId)
    }
 
    var query = "+PATH:\"/app:company_home/st:sites/cm:" + search.ISO9075Encode(site.shortName) + "/cm:calendar/*\" ";
-   query += "+TYPE:\"{com.infoaxon.alfresco.calendar}calendarEvent\"";
+   query += "+TYPE:\"{http\://www.alfresco.org/model/calendar}calendarEvent\"";
 
    var results = search.luceneSearch(query, "ia:fromDate", true);
    var e, events = [];
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
index 36cb479ba0..f892508382 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.js
@@ -44,7 +44,7 @@ function getUserEvents(user, range)
 	
 	if (paths.length > 0)
 	{
-		var luceneQuery = "+(" + paths.join(" OR ") + ") +TYPE:\"{com.infoaxon.alfresco.calendar}calendarEvent\"";
+		var luceneQuery = "+(" + paths.join(" OR ") + ") +TYPE:\"{http\://www.alfresco.org/model/calendar}calendarEvent\"";
 		if (range.fromdate)
 		{
 			// Expects the date in the format yyyy/mm/dd
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
index 246acf98d6..086b88ec8c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
@@ -221,7 +221,7 @@ function getForumPostItem(siteId, containerId, restOfPath, node)
 function getCalendarItem(siteId, containerId, restOfPath, node)
 {
    // only process nodes of the correct type
-   if (node.type != "{com.infoaxon.alfresco.calendar}calendarEvent")
+   if (node.type != "{http://www.alfresco.org/model/calendar}calendarEvent")
    {
       return null;
    }