diff --git a/calendar/lightning/content/lightning-preferences.xul b/calendar/lightning/content/lightning-preferences.xul
index 0eb756532ac..ddecd0c8a1e 100644
--- a/calendar/lightning/content/lightning-preferences.xul
+++ b/calendar/lightning/content/lightning-preferences.xul
@@ -54,8 +54,8 @@
       <preference id="calendar.alarms.playsound" name="calendar.alarms.playsound" type="bool"/>
       <preference id="calendar.alarms.playfile" name="calendar.alarms.playfile" type="string"/>
       <preference id="calendar.alarms.defaultsnoozelength" name="calendar.alarms.defaultsnoozelength" type="int"/>
-      <preference id="calendar.event.defaultstarthour" name="calendar.event.defaultstarthour" type="int"/>
-      <preference id="calendar.event.defaultendhour" name="calendar.event.defaultendhour" type="int"/>
+      <preference id="calendar.view.defaultstarthour" name="calendar.view.defaultstarthour" type="int"/>
+      <preference id="calendar.view.defaultendhour" name="calendar.view.defaultendhour" type="int"/>
       <preference id="calendar.week.start" name="calendar.week.start" type="int"/>
       <preference id="calendar.timezone.local" name="calendar.timezone.local" type="string"/>
     </preferences>
@@ -106,11 +106,11 @@
             <rows>
               <row align="center">
                 <label value="&pref.calendar.view.starttime.label;"/>
-                <textbox preference="calendar.event.defaultstarthour"/>
+                <textbox preference="calendar.view.defaultstarthour"/>
               </row>
               <row align="center">
                 <label value="&pref.calendar.view.endtime.label;"/>
-                <textbox preference="calendar.event.defaultendhour"/>
+                <textbox preference="calendar.view.defaultendhour"/>
               </row>
               <row align="center">
                 <description>&pref.weekstarts.label;</description>
diff --git a/calendar/lightning/content/lightning.js b/calendar/lightning/content/lightning.js
index 9db48c5eb53..22a42c9d783 100644
--- a/calendar/lightning/content/lightning.js
+++ b/calendar/lightning/content/lightning.js
@@ -39,8 +39,8 @@
 pref("calendar.alarms.playsound", false);
 pref("calendar.alarms.playfile", "");
 pref("calendar.alarms.defaultsnoozelength", 5);
-pref("calendar.event.defaultstarthour", 8);
-pref("calendar.event.defaultendhour", 17);
+pref("calendar.view.defaultstarthour", 8);
+pref("calendar.view.defaultendhour", 17);
 
 // 0=Sunday, 1=Monday, 2=Tuesday, etc.  One day we might want to move this to
 // a locale specific file.
diff --git a/calendar/lightning/content/messenger-overlay-sidebar.js b/calendar/lightning/content/messenger-overlay-sidebar.js
index 3f3a254c12b..6f44937aaa4 100644
--- a/calendar/lightning/content/messenger-overlay-sidebar.js
+++ b/calendar/lightning/content/messenger-overlay-sidebar.js
@@ -91,8 +91,8 @@ function ltnOnLoad(event)
     // Set up the multiday-view to start/end at the correct hours, since this
     // doesn't persist between startups.  (Fails if pref undefined)
     try {
-        var sHour = rootPrefBranch.getIntPref("calendar.event.defaultstarthour");
-        var eHour = rootPrefBranch.getIntPref("calendar.event.defaultendhour");
+        var sHour = rootPrefBranch.getIntPref("calendar.view.defaultstarthour");
+        var eHour = rootPrefBranch.getIntPref("calendar.view.defaultendhour");
         document.getElementById("calendar-multiday-view")
                 .setStartEndMinutes(sHour*60, eHour*60);
     }
@@ -252,12 +252,12 @@ var ltnPrefObserver =
    observe: function(aSubject, aTopic, aPrefName)
    {
        switch (aPrefName) {
-           case "calendar.event.defaultstarthour":
-           case "calendar.event.defaultendhour":
+           case "calendar.view.defaultstarthour":
+           case "calendar.view.defaultendhour":
                var sHour = this.rootPrefBranch.getIntPref
-                               ("calendar.event.defaultstarthour");
+                               ("calendar.view.defaultstarthour");
                var eHour = this.rootPrefBranch.getIntPref
-                                ("calendar.event.defaultendhour");
+                                ("calendar.view.defaultendhour");
                document.getElementById("calendar-multiday-view")
                        .setStartEndMinutes(sHour*60, eHour*60);
                break;
diff --git a/calendar/resources/content/pref/rootCalendarPref.js b/calendar/resources/content/pref/rootCalendarPref.js
index 9f67c70be9d..045c9d5e98a 100644
--- a/calendar/resources/content/pref/rootCalendarPref.js
+++ b/calendar/resources/content/pref/rootCalendarPref.js
@@ -59,8 +59,8 @@ calendarPrefObserver.prototype =
         // when calendar pref was changed, we reinitialize 
         switch( prefName )
         {
-            case "calendar.event.defaultstarthour":
-            case "calendar.event.defaultendhour":
+            case "calendar.view.defaultstarthour":
+            case "calendar.view.defaultendhour":
             case "calendar.previousweeks.inview":
             case "calendar.week.d0sundaysoff":
             case "calendar.week.d1mondaysoff":
@@ -161,8 +161,8 @@ function calendarPreferences( CalendarWindow )
    getIntPref( this.calendarPref, "alarms.defaultsnoozelength", calendarStringBundle.GetStringFromName("defaultSnoozeAlarmLength" ) );
    getIntPref( this.calendarPref, "date.format", calendarStringBundle.GetStringFromName("dateFormat" ) );
    getBoolPref( this.calendarPref, "dateformat.storeingmt", calendarStringBundle.GetStringFromName("storeInGmt") );
-   getIntPref( this.calendarPref, "event.defaultstarthour", calendarStringBundle.GetStringFromName("defaultStartHour" ) );
-   getIntPref( this.calendarPref, "event.defaultendhour", calendarStringBundle.GetStringFromName("defaultEndHour" ) );
+   getIntPref( this.calendarPref, "view.defaultstarthour", calendarStringBundle.GetStringFromName("defaultStartHour" ) );
+   getIntPref( this.calendarPref, "view.defaultendhour", calendarStringBundle.GetStringFromName("defaultEndHour" ) );
    getIntPref( this.calendarPref, "week.start", calendarStringBundle.GetStringFromName("defaultWeekStart" ) );
    getBoolPref( this.calendarPref, "week.d0sundaysoff", "true"==calendarStringBundle.GetStringFromName("defaultWeekSundaysOff" ) );
    getBoolPref( this.calendarPref, "week.d1mondaysoff", "true"==calendarStringBundle.GetStringFromName("defaultWeekMondaysOff" ) );
diff --git a/calendar/resources/content/pref/viewPrefs.xul b/calendar/resources/content/pref/viewPrefs.xul
index 620d9c73262..fdc1c692c51 100644
--- a/calendar/resources/content/pref/viewPrefs.xul
+++ b/calendar/resources/content/pref/viewPrefs.xul
@@ -112,7 +112,7 @@
 <hbox flex="1" align="center">
 	<description flex="1" >&pref.calendar.view.restrict.label;</description>
 	<description>&pref.calendar.view.starttime.label;</description>
-	 <menulist id="daystarthour" preftype="int" prefstring="calendar.event.defaultstarthour"  value="8">
+	 <menulist id="daystarthour" preftype="int" prefstring="calendar.view.defaultstarthour"  value="8">
 		 <menupopup id="daystarthour">
 			 <menuitem label="&pref.hour.00;"    value="0"/>
 			 <menuitem label="&pref.hour.01;"    value="1"/>
@@ -141,7 +141,7 @@
 		</menupopup>
 	</menulist>
 	<description>&pref.calendar.view.endtime.label;</description>
-	 <menulist id="dayendhour" preftype="int" prefstring="calendar.event.defaultendhour"  value="17">
+	 <menulist id="dayendhour" preftype="int" prefstring="calendar.view.defaultendhour"  value="17">
 		 <menupopup id="dayendhour">
 			 <menuitem label="&pref.hour.00;"    value="0"/>
 			 <menuitem label="&pref.hour.01;"    value="1"/>