Index: openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.ado
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/Attic/calendar-admin-includelet.ado,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.ado	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.ado	14 Aug 2008 19:46:07 -0000	1.2
@@ -1,26 +1,5 @@
-<%
-
-    #
-    #  Copyright (C) 2001, 2002 MIT
-    #
-    #  This file is part of dotLRN.
-    #
-    #  dotLRN is free software; you can redistribute it and/or modify it under the
-    #  terms of the GNU General Public License as published by the Free Software
-    #  Foundation; either version 2 of the License, or (at your option) any later
-    #  version.
-    #
-    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
-    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    #  details.
-    #
-
-%>
-
-
 <ul>
-<li> <a href="@url@?action=add&show_cal_nav=0&force_calendar_id=@calendar_id@">#calendar-portlet.Create_a_new_Event#</a>
-<li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@">#calendar-portlet.lt_Manage_Calendar_Event#</a>
+<li> <a href="@url@?action=add&show_cal_nav=0&force_calendar_id=@calendar_id@">#calendar-includelet.Create_a_new_Event#</a>
+<li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@">#calendar-includelet.lt_Manage_Calendar_Event#</a>
 </ul>
 
Index: openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl	14 Aug 2008 19:46:07 -0000	1.2
@@ -1,5 +1,5 @@
 ad_page_contract {
-    The display logic for the calendar admin portlet
+    The display logic for the calendar admin includelet
 
     @author Arjun Sanyal (arjun@openforce.net)
     @author Ben Adida (ben@openforce.net)
Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp	14 Aug 2008 19:46:07 -0000	1.2
@@ -15,8 +15,8 @@
       <p align="left">
 
       <ul align="left">
-        <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">#calendar-portlet.Add_an_item#</a></if>
-        <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-portlet.Manage_Item_Types#</a></if>
+        <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">#calendar-includelet.Add_an_item#</a></if>
+        <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-includelet.Manage_Item_Types#</a></if>
       </ul>
     </td>
     <td valign=top>
Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl	14 Aug 2008 19:46:07 -0000	1.2
@@ -1,5 +1,5 @@
 ad_page_contract {
-    The display logic for the calendar portlet
+    The display logic for the calendar includelet
 
     @author Arjun Sanyal (arjun@openforce.net)
     @cvs_id $Id$
@@ -76,7 +76,7 @@
     set item_add_template ""
 }
 
-set url_stub_callback "calendar_portlet_display::get_url_stub" 
+set url_stub_callback "calendar_includelet_display::get_url_stub" 
 
 if {$view == "day"} {
     if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	14 Aug 2008 19:46:07 -0000	1.2
@@ -67,7 +67,7 @@
     set item_add_template ""
 }
 
-set url_stub_callback "calendar_portlet_display::get_url_stub" 
+set url_stub_callback "calendar_includelet_display::get_url_stub" 
 
 if { $view == "day" } {
     if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
Index: openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl	14 Aug 2008 19:46:07 -0000	1.2
@@ -1,5 +1,5 @@
 ad_page_contract {
-    The display logic for the calendar portlet
+    The display logic for the calendar includelet
 
     @author Arjun Sanyal (arjun@openforce.net)
     @cvs_id $Id$
@@ -72,6 +72,6 @@
 set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
 
 set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
-set url_stub_callback "calendar_portlet_display::get_url_stub" 
+set url_stub_callback "calendar_includelet_display::get_url_stub" 
 
 ad_return_template
Index: openacs-4/packages/calendar-includelet/tcl/calendar-includelet-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/tcl/Attic/calendar-includelet-display-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/tcl/calendar-includelet-display-procs.tcl	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/tcl/calendar-includelet-display-procs.tcl	14 Aug 2008 19:46:07 -0000	1.2
@@ -1,32 +1,13 @@
-#
-#  Copyright (C) 2001, 2002 MIT
-#
-#  This file is part of dotLRN.
-#
-#  dotLRN is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or (at your option) any later
-#  version.
-#
-#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-#  details.
-#
-
-# calendar-portlet/tcl/calendar-portlet-display-procs.tcl
-
 ad_library {
 
-Procedures to support the calendar portlet display
+Procedures to support the calendar includelet display
 
-@creation-date April 15, 2002
-@author ben@openforce.net
+@creation-date April 15, 2008
 @cvs-id $Id$
 
 }
 
-namespace eval calendar_portlet_display {
+namespace eval calendar_includelet_display {
     
     ad_proc -public get_url_stub {
         calendar_id