diff --git a/announcement/announcement-impl/impl/src/bundle/siteemaanc.properties b/announcement/announcement-impl/impl/src/bundle/siteemaanc.properties
index 1111892f5de4..ad082104c947 100644
--- a/announcement/announcement-impl/impl/src/bundle/siteemaanc.properties
+++ b/announcement/announcement-impl/impl/src/bundle/siteemaanc.properties
@@ -5,8 +5,8 @@ Attachments = Attachments:
 noti.header.add= An announcement has been added in the "{0}" site at (<a href="{1}">{1}</a>)
 noti.header.update= An announcement has been updated in the "{0}" site at (<a href="{1}">{1}</a>)
 noti.subj= [ {0} -  Announcement ] {1}
-noti.tag.html= <hr/><br/>This automatic notification message was sent by {0} (<a href="{1}">{1}</a>).<br/> You can modify how you receive notifications at My Workspace > Preferences.<br/>
-noti.tag= ---------------------- \n This automatic notification message was sent by {0} ({1}).\n You can modify how you receive notifications at My Workspace > Preferences.\n
+noti.tag.html= <hr/><br/>This automatic notification message was sent by {0} (<a href="{1}">{1}</a>).<br/> You can modify how you receive notifications at Home > Preferences.<br/>
+noti.tag= ---------------------- \n This automatic notification message was sent by {0} ({1}).\n You can modify how you receive notifications at Home > Preferences.\n
 at_date=at
 
 
@@ -23,4 +23,4 @@ Allgroups = Site
 #######################333#UPV Revision###################
 syllabus_new_posted_item = New posted item
 syllabus_existed_item_changed = Existed item changed
-syllabus_posted_deleted = Posted item deleted
\ No newline at end of file
+syllabus_posted_deleted = Posted item deleted
diff --git a/announcement/announcement-impl/impl/src/bundle/siteemaanc_en_GB.properties b/announcement/announcement-impl/impl/src/bundle/siteemaanc_en_GB.properties
index 4d688d9ad70d..4384ce1b6b5f 100644
--- a/announcement/announcement-impl/impl/src/bundle/siteemaanc_en_GB.properties
+++ b/announcement/announcement-impl/impl/src/bundle/siteemaanc_en_GB.properties
@@ -7,8 +7,8 @@ noti.header.add2=An announcement has been added in the "{0}"<br/>To view this pl
 noti.header.update=An announcement has been updated in the "{0}" site at {1} (<a href="{2}">{2}</a>)
 noti.header.update2=An announcement has been updated in the "{0}"<br/>To view this please login.<br/><br/><a href="{1}">{1}</a>
 noti.subj= [ {0} -  Announcement ] {1}
-noti.tag.html= <hr/><br/>This automatic notification message was sent by {0} (<a href="{1}">{1}</a>) from the {2} site.<br/> You can modify how you receive notifications at My Workspace > Preferences.<br/>
-noti.tag= ---------------------- \nThis automatic notification message was sent by {0} ({1}) from the {2} site.\n You can modify how you receive notifications at My Workspace > Preferences.\n
+noti.tag.html= <hr/><br/>This automatic notification message was sent by {0} (<a href="{1}">{1}</a>) from the {2} site.<br/> You can modify how you receive notifications at Home > Preferences.<br/>
+noti.tag= ---------------------- \nThis automatic notification message was sent by {0} ({1}) from the {2} site.\n You can modify how you receive notifications at Home > Preferences.\n
 
 
 Subject = Subject: 
@@ -24,4 +24,4 @@ Allgroups = Site
 #######################333#UPV Revision###################
 syllabus_new_posted_item = New posted item
 syllabus_existed_item_changed = Existed item changed
-syllabus_posted_deleted = Posted item deleted
\ No newline at end of file
+syllabus_posted_deleted = Posted item deleted
diff --git a/announcement/announcement-impl/impl/src/bundle/siteemaanc_mn.properties b/announcement/announcement-impl/impl/src/bundle/siteemaanc_mn.properties
index 0b25cb7abe8d..a244178e431c 100755
--- a/announcement/announcement-impl/impl/src/bundle/siteemaanc_mn.properties
+++ b/announcement/announcement-impl/impl/src/bundle/siteemaanc_mn.properties
@@ -10,8 +10,8 @@ Attachments = \u0425\u0430\u0432\u0441\u0440\u0430\u043B\u0442\u0443\u0443\u0434
 noti.header.add= {1} \u0434\u0430\u0445\u044C "{0}" \u0441\u0430\u0439\u0442\u0430\u0434 \u0437\u0430\u0440\u043B\u0430\u043B \u043D\u044D\u043C\u044D\u0433\u0434\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430 (<a href="{2}">{2}</a>)
 noti.header.update= {1} \u0434\u0430\u0445\u044C "{0}" \u0441\u0430\u0439\u0442\u0430\u0434 \u0437\u0430\u0440\u043B\u0430\u043B \u0448\u0438\u043D\u044D\u0447\u043B\u044D\u0433\u0434\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430 (<a href="{2}">{2}</a>)
 noti.subj= [ {0} -  \u0417\u0430\u0440\u043B\u0430\u043B ] {1}
-noti.tag.html= <hr/><br/> \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 {2} \u0441\u0430\u0439\u0442\u0430\u0430\u0441 {0} (<a href="{1}">{1}</a>) \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430.<br/> \u0422\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 My Workspace > Preferences-\u0430\u0430\u0441 \u0441\u043E\u043D\u0433\u043E\u0436 \u0431\u043E\u043B\u043D\u043E.<br/>
-noti.tag= ---------------------- \n \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 {2} \u0441\u0430\u0439\u0442\u0430\u0430\u0441 {0} ({1}) \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430.\n \u0422\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 My Workspace > Preferences-\u0430\u0430\u0441 \u0441\u043E\u043D\u0433\u043E\u0436 \u0431\u043E\u043B\u043D\u043E.\n
+noti.tag.html= <hr/><br/> \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 {2} \u0441\u0430\u0439\u0442\u0430\u0430\u0441 {0} (<a href="{1}">{1}</a>) \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430.<br/> \u0422\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 Home > Preferences-\u0430\u0430\u0441 \u0441\u043E\u043D\u0433\u043E\u0436 \u0431\u043E\u043B\u043D\u043E.<br/>
+noti.tag= ---------------------- \n \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 {2} \u0441\u0430\u0439\u0442\u0430\u0430\u0441 {0} ({1}) \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430.\n \u0422\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 Home > Preferences-\u0430\u0430\u0441 \u0441\u043E\u043D\u0433\u043E\u0436 \u0431\u043E\u043B\u043D\u043E.\n
 
 
 Subject = \u0425\u0438\u0447\u044D\u044D\u043B: 
@@ -27,4 +27,4 @@ Allgroups = \u0421\u0430\u0439\u0442
 #######################333#UPV Revision###################
 syllabus_new_posted_item = \u0428\u0438\u043D\u044D\u044D\u0440 \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0437\u04AF\u0439\u043B
 syllabus_existed_item_changed = \u0411\u0430\u0439\u0441\u0430\u043D \u0437\u04AF\u0439\u043B\u0438\u0439\u0433 \u0441\u043E\u043B\u0438\u0441\u043E\u043D
-syllabus_posted_deleted = \u0418\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0437\u04AF\u0439\u043B\u0438\u0439\u0433 \u0443\u0441\u0442\u0433\u0430\u0441\u0430\u043D
\ No newline at end of file
+syllabus_posted_deleted = \u0418\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0437\u04AF\u0439\u043B\u0438\u0439\u0433 \u0443\u0441\u0442\u0433\u0430\u0441\u0430\u043D
diff --git a/announcement/announcement-impl/impl/src/bundle/siteemaanc_sv.properties b/announcement/announcement-impl/impl/src/bundle/siteemaanc_sv.properties
index 94422bbe68c8..78923e17e4f7 100644
--- a/announcement/announcement-impl/impl/src/bundle/siteemaanc_sv.properties
+++ b/announcement/announcement-impl/impl/src/bundle/siteemaanc_sv.properties
@@ -15,8 +15,8 @@ in_the=p\u00e5
 noti.header.add=En notis har lagts till p\u00e5 sajten "{0}" i {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
 noti.header.update=En notis har uppdaterats p\u00e5 sajten "{0}" i {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
 noti.subj=[ {0} -  notis ] {1}
-noti.tag=----------------------\n Denna automatiska notifiering skickades av {0} ({1}) fr\u00e5n sajten '{2}' .\n Du kan \u00e4ndra hur du tar emot notifieringar i 'My Workspace/Min arbetsyta' > Preferences/Inst\u00e4llningar.\n
-noti.tag.html=<hr/><br/>Denna automatiska notifiering skickades av {0} (<a href\="{1}">{1}</a>) fr\u00e5n sajten '{2}' .<br/>Du kan \u00e4ndra hur du tar emot notifieringar i 'My Workspace/Min arbetsyta' > Preferences/Inst\u00e4llningar.<br/>
+noti.tag=----------------------\n Denna automatiska notifiering skickades av {0} ({1}) fr\u00e5n sajten '{2}' .\n Du kan \u00e4ndra hur du tar emot notifieringar i 'Home/Min arbetsyta' > Preferences/Inst\u00e4llningar.\n
+noti.tag.html=<hr/><br/>Denna automatiska notifiering skickades av {0} (<a href\="{1}">{1}</a>) fr\u00e5n sajten '{2}' .<br/>Du kan \u00e4ndra hur du tar emot notifieringar i 'Home/Min arbetsyta' > Preferences/Inst\u00e4llningar.<br/>
 separator=----------------------
 site=sajt.
 site_at=sajten
@@ -25,4 +25,4 @@ syllabus_new_posted_item=Nytt objekt postat
 syllabus_posted_deleted=Upplagt objekt raderat
 this=Denna automatiska notifiering skickades av
 updated=uppdaterats
-youcan=Du kan \u00e4ndra hur du tar emot notifieringar i 'My Workspace/Min arbetsyta' > Preferences/Inst\u00e4llningar.
+youcan=Du kan \u00e4ndra hur du tar emot notifieringar i 'Home/Min arbetsyta' > Preferences/Inst\u00e4llningar.
diff --git a/announcement/announcement-impl/impl/src/bundle/siteemaanc_vi.properties b/announcement/announcement-impl/impl/src/bundle/siteemaanc_vi.properties
index 7f5ba4b650e5..27d56122e1d3 100644
--- a/announcement/announcement-impl/impl/src/bundle/siteemaanc_vi.properties
+++ b/announcement/announcement-impl/impl/src/bundle/siteemaanc_vi.properties
@@ -11,11 +11,11 @@ Message=Th\u00F4ng b\u00E1o\:
 Group=Nh\u00F3m\: 
 From=T\u1EEB\: 
 Attachments=\u0110\u00EDnh k\u00E8m\: 
-noti.tag.html=<hr/><br/> Th\u00F4ng \u0111i\u1EC7p n\u00E0y th\u00F4ng b\u00E1o s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ( <a href\="{1}">{1}</a> ) t\u1EEB {2} trang web. <br/> B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. <br/>
+noti.tag.html=<hr/><br/> Th\u00F4ng \u0111i\u1EC7p n\u00E0y th\u00F4ng b\u00E1o s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ( <a href\="{1}">{1}</a> ) t\u1EEB {2} trang web. <br/> B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences. <br/>
 noti.header.add=Th\u00F4ng b\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt trong "{0}" trang web t\u1EA1i {1} (<a href\="{2}">{2}</a>) 
 Allgroups=Trang web 
 Public=C\u00F4ng khai 
-noti.tag=---------------------- T\u1EF1 \u0111\u1ED9ng th\u00F4ng b\u00E1o tin nh\u1EAFn n\u00E0y  \u0111\u00E3 \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ({1}) t\u1EEB {2} trang web. \n B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences.\n 
+noti.tag=---------------------- T\u1EF1 \u0111\u1ED9ng th\u00F4ng b\u00E1o tin nh\u1EAFn n\u00E0y  \u0111\u00E3 \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ({1}) t\u1EEB {2} trang web. \n B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences.\n 
 Date=Ng\u00E0y\: 
 syllabus_posted_deleted=Item \u0110\u0103ng m\u1EE5c \u0111\u00E3 b\u1ECB x\u00F3a 
 syllabus_existed_item_changed=Item hi\u1EC7n t\u1EA1i thay \u0111\u1ED5i 
diff --git a/assignment/assignment-bundles/resources/assignment_sv.properties b/assignment/assignment-bundles/resources/assignment_sv.properties
index d19239cbb041..9e13284159b1 100644
--- a/assignment/assignment-bundles/resources/assignment_sv.properties
+++ b/assignment/assignment-bundles/resources/assignment_sv.properties
@@ -692,8 +692,8 @@ somelsis_calendar=                      N\u00e5gon annan h\u00e5ller p\u00e5 att
 stuviewsubm.removeatt=             Ta bort
 stuviewsubm.attfromcomputerlabel=                V\u00e4lj en fil fr\u00e5n datorn (totalt 5)
 stuviewsubm.attfromcomputerlabelmore=                  V\u00e4lj fler filer fr\u00e5n datorn (totalt 5)
-stuviewsubm.attfromserverlabel=                                     eller v\u00e4lj filer fr\u00e5n My Workspace / Min arbetsyta eller annan sajt
-stuviewsubm.attfromserverlabelmore=          eller v\u00e4lj fler filer fr\u00e5n My Workspace / Min arbetsyta eller annan sajt
+stuviewsubm.attfromserverlabel=                                     eller v\u00e4lj filer fr\u00e5n Home / Min arbetsyta eller annan sajt
+stuviewsubm.attfromserverlabelmore=          eller v\u00e4lj fler filer fr\u00e5n Home / Min arbetsyta eller annan sajt
 stuviewsubm.submitreminder=                    Gl\u00f6m inte att spara eller skicka in
 theassiid_isnotval=                         Uppgifts-id ''{0}'' \u00e4r inte giltigt.
 theassiid_hasnotbee=                    Uppgifts-id ''{0}'' har inte anv\u00e4nts.
@@ -759,4 +759,4 @@ additional_information=                          Ytterligare information
 failed.upload=                      Uppladdningen misslyckades
 download_url_link_label=                   L\u00e4nk f\u00f6r att ladda ned allt
 allPurpose_save=       Spara
-allPurpose_cancel=               Avbryt
\ No newline at end of file
+allPurpose_cancel=               Avbryt
diff --git a/basiclti/web-ifp/src/bundle/iframe.properties b/basiclti/web-ifp/src/bundle/iframe.properties
index 062129f8eb71..abd85f27ba95 100644
--- a/basiclti/web-ifp/src/bundle/iframe.properties
+++ b/basiclti/web-ifp/src/bundle/iframe.properties
@@ -3,7 +3,7 @@ gen.alert = Alert:
 gen.custom = Customize Web Content
 gen.custom.site = Customize Server Info Display
 gen.custom.worksite = Customize Site Info Display
-gen.custom.workspace = Customize My Workspace Info Display
+gen.custom.workspace = Customize Home Info Display
 gen.height = Frame Height
 gen.title = Title
 gen.tootit = Tool Title
diff --git a/calendar/calendar-bundles/resources/calendar.properties b/calendar/calendar-bundles/resources/calendar.properties
index 9b8d88535b4b..8256af4b9850 100644
--- a/calendar/calendar-bundles/resources/calendar.properties
+++ b/calendar/calendar-bundles/resources/calendar.properties
@@ -488,7 +488,7 @@ ical_opaqueurl_header=Generate a Link to this Calendar for Personal Use
 ical_opaqueurl_header_existing = Subscribe to this Calendar
 ical_opaqueurl_explanation=Please click the 'Generate' button to create a link to this calendar. The link is for private use only and will allow events from this site to be displayed in other calendaring applications.
 ical_opaqueurl_explanation_existing = The following links are for private use only. If you have accidentally disclosed the URL to others then please click the 'Regenerate' button to create a new private link.
-ical_opaqueurl_myworkspace=Note: If you subscribe to the calendar in your 'My Workspace', it will aggregate the events from the calendars of all the sites of which you are a member.
+ical_opaqueurl_myworkspace=Note: If you subscribe to the calendar in your 'Home', it will aggregate the events from the calendars of all the sites of which you are a member.
 ical_opaqueurl_generate=Generate
 ical_opaqueurl_webcal=If you click on the link below, your browser should present you with a client (e.g. Outlook) that you can use to subscribe to this calendar:
 ical_opaqueurl_http=Alternatively, copy and paste this link to your web-based or desktop calendar client.
diff --git a/calendar/calendar-bundles/resources/calendar_ja.properties b/calendar/calendar-bundles/resources/calendar_ja.properties
index 3bdfc335242a..58c6623747e6 100644
--- a/calendar/calendar-bundles/resources/calendar_ja.properties
+++ b/calendar/calendar-bundles/resources/calendar_ja.properties
@@ -395,7 +395,7 @@ ical_opaqueurl_header=\u500b\u4eba\u7528\u306b\u3053\u306e\u30ab\u30ec\u30f3\u30
 ical_opaqueurl_header_existing=\u3053\u306e\u30ab\u30ec\u30f3\u30c0\u3092\u8cfc\u8aad\u3057\u307e\u3059
 ical_opaqueurl_explanation=\u3053\u306e\u30ab\u30ec\u30f3\u30c0\u30fc\u306b\u30ea\u30f3\u30af\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f'\u751f\u6210'\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\uff0e\u3053\u306e\u30ea\u30f3\u30af\u306f\u500b\u4eba\u5229\u7528\u306e\u307f\u3067\uff0c\u3053\u306e\u30b5\u30a4\u30c8\u304b\u3089\u306e\u30a4\u30d9\u30f3\u30c8\u306f\u4ed6\u306e\u30ab\u30ec\u30f3\u30c0\u30fc\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u8868\u793a\u3055\u308c\u307e\u3059\uff0e
 ical_opaqueurl_explanation_existing=\u6b21\u306e\u30ea\u30f3\u30af\u306f\u500b\u4eba\u5229\u7528\u306e\u307f\u3067\u3059\uff0e\u3082\u3057\u4ed6\u306e\u30e6\u30fc\u30b6\u306b\u8b1d\u3063\u3066URL\u3092\u516c\u958b\u3057\u3066\u3057\u307e\u3063\u305f\u5834\u5408\uff0c\u65b0\u3057\u3044\u500b\u4eba\u30ea\u30f3\u30af\u3092\u751f\u6210\u3059\u308b\u305f\u3081\u306b'\u518d\u751f\u6210'\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\uff0e
-ical_opaqueurl_myworkspace=\u6ce8\u610f\uff1a'My Workspace' \u306e\u30ab\u30ec\u30f3\u30c0\u3092\u8cfc\u8aad\u3059\u308b\u3068\uff0c\u30e1\u30f3\u30d0\u30fc\u3068\u306a\u3063\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u30b5\u30a4\u30c8\u306e\u30ab\u30ec\u30f3\u30c0\u304b\u3089\u30a4\u30d9\u30f3\u30c8\u304c\u307e\u3068\u3081\u3089\u308c\u307e\u3059\uff0e
+ical_opaqueurl_myworkspace=\u6ce8\u610f\uff1a'Home' \u306e\u30ab\u30ec\u30f3\u30c0\u3092\u8cfc\u8aad\u3059\u308b\u3068\uff0c\u30e1\u30f3\u30d0\u30fc\u3068\u306a\u3063\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u30b5\u30a4\u30c8\u306e\u30ab\u30ec\u30f3\u30c0\u304b\u3089\u30a4\u30d9\u30f3\u30c8\u304c\u307e\u3068\u3081\u3089\u308c\u307e\u3059\uff0e
 ical_opaqueurl_generate=\u751f\u6210
 ical_opaqueurl_webcal=\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\uff0c\u30d6\u30e9\u30a6\u30b6\u306f\u3053\u306e\u30ab\u30ec\u30f3\u30c0\u3092\u8cfc\u8aad\u3059\u308b\u305f\u3081\u306b\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u308b\u30af\u30e9\u30a4\u30a2\u30f3\u30c8(\u4f8b\u3048\u3070 Outlook) \u3092\u8868\u793a\u3057\u307e\u3059\uff0e
 ical_opaqueurl_http=\u4ee3\u308f\u308a\u306b\uff0c\u3053\u306e\u30ea\u30f3\u30af\u3092Web\u30d9\u30fc\u30b9\u304b\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u306e\u30ab\u30ec\u30f3\u30c0\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u30b3\u30d4\u30fc\uff06\u30da\u30fc\u30b9\u30c8\u3057\u307e\u3059\uff0e
diff --git a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
index 9d59adf19c05..ca95d9a5937a 100644
--- a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
+++ b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -2026,7 +2026,7 @@
 # DEFAULT: false
 # calendar.external.subscriptions.enable=true
 
-# Merge External iCal Subscriptions from other sites into My Workspace?
+# Merge External iCal Subscriptions from other sites into Home?
 # DEFAULT: false
 # calendar.external.subscriptions.mergeIntoMyworkspace = true
 
@@ -2043,7 +2043,7 @@
 # This is optional and will assign a name to the subscription urls above (default is the url)
 # calendar.external.subscriptions.name.count=2
 # calendar.external.subscriptions.name.1=Calend\u00e1rio Acad\u00e9mico UFP
-# calendar.external.subscriptions.name.2=My Workspace de nuno2
+# calendar.external.subscriptions.name.2=Home de nuno2
 
 # 3. Institutional iCal Subscriptions: EVENT TYPES (optional)
 # This is optional and will force events to have a specified type (default is Activity)
@@ -3314,7 +3314,7 @@
 # DEFAULT: title
 # sitebrowser.termsearch.display=title
 
-# A type of site to exclude from site search results. "My Workspace" sites are excluded whether or not this is set. 
+# A type of site to exclude from site search results. "Home" sites are excluded whether or not this is set. 
 # DEFAULT: none (null)
 # sitesearch.noshow.sitetype=portfolioAdmin
 
@@ -4103,8 +4103,8 @@
  
 #delegatedaccess.sync.myworkspacetool
 #true by default.  This setting will sync a user's MyWorkspace with the Delegated Access tool.  Another words,
-#if the user is granted permissions in the tool, it will add the Delegated Access tool to their My Workspace.
-#if all the permissions are removed for a user, it will remove the Delegated Access tool from their My Workspace
+#if the user is granted permissions in the tool, it will add the Delegated Access tool to their Home.
+#if all the permissions are removed for a user, it will remove the Delegated Access tool from their Home
 #Example:
 #delegatedaccess.sync.myworkspacetool=true
  
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl.properties
index 1133b570c628..a0edecd9ca23 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl.properties
@@ -4,4 +4,4 @@ notif = notification digest for
 
 thiaut = This automatic notification message digest was sent to users of
 
-youcan = You can modify your notification preferences in your My Workspace.
+youcan = You can modify your notification preferences in your Home.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_en_GB.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_en_GB.properties
index 1133b570c628..a0edecd9ca23 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_en_GB.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_en_GB.properties
@@ -4,4 +4,4 @@ notif = notification digest for
 
 thiaut = This automatic notification message digest was sent to users of
 
-youcan = You can modify your notification preferences in your My Workspace.
+youcan = You can modify your notification preferences in your Home.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_sv.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_sv.properties
index 24e77a0e7824..ce0138654c7b 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_sv.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_sv.properties
@@ -1,4 +1,4 @@
 #Stored by I18NEdit, may be edited!
 notif=Sammanfattande notifiering  f\u00F6r 
 thiaut=Denna automatiska sammanfattning skickades till anv\u00E4ndare av
-youcan=Du kan \u00E4ndra hur du tar emot notifieringar om e-post i My Workspace.
+youcan=Du kan \u00E4ndra hur du tar emot notifieringar om e-post i Home.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_vi.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_vi.properties
index 28e685bbb8c3..e04dd8e357dc 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_vi.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/emailimpl/email-impl_vi.properties
@@ -5,4 +5,4 @@
 #Tue Sep 07 15:05:28 PDT 2010
 notif=th\u00F4ng b\u00E1o cho ti\u00EAu h\u00F3a 
 thiaut=Th\u00F4ng \u0111i\u1EC7p n\u00E0y th\u00F4ng b\u00E1o s\u1EBD ti\u00EAu h\u00F3a \u0111\u00E3 \u0111\u01B0\u1EE3c g\u1EEDi \u0111\u1EBFn ng\u01B0\u1EDDi s\u1EED d\u1EE5ng 
-youcan=B\u1EA1n c\u00F3 th\u1EC3 s\u1EEDa \u0111\u1ED5i s\u1EDF th\u00EDch th\u00F4ng b\u00E1o c\u1EE7a b\u1EA1n trong My Workspace c\u1EE7a b\u1EA1n. 
+youcan=B\u1EA1n c\u00F3 th\u1EC3 s\u1EEDa \u0111\u1ED5i s\u1EDF th\u00EDch th\u00F4ng b\u00E1o c\u1EE7a b\u1EA1n trong Home c\u1EE7a b\u1EA1n. 
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon.properties
index 66c60b16dbfc..be003746d36c 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon.properties
@@ -38,7 +38,7 @@ site = site.
 
 this = This automatic notification message was sent by
 
-youcan = You can modify how you receive notifications at My Workspace > Preferences.
+youcan = You can modify how you receive notifications at Home > Preferences.
 
 db.subj.upd = [ {0} - Dropbox item changed in "{1}" ] {2}
 db.subj.new = [ {0} - New dropbox item in "{1}" ] {2}
@@ -51,4 +51,4 @@ db.text.upd.dnd = Several resources have been updated in the dropbox for "{0}" i
 db.text.new.dnd = New resources have been added to the dropbox for "{0}" in the "{1}" site at {2} ({3})  
 
 db.text.location = Location: site "{0}" > Drop Box {1} > {2} 
-db.text.prefs = This automatic notification message was sent by {0} ({1}) from the dropbox in the {2} site. You can modify how you receive notifications at My Workspace > Preferences.
\ No newline at end of file
+db.text.prefs = This automatic notification message was sent by {0} ({1}) from the dropbox in the {2} site. You can modify how you receive notifications at Home > Preferences.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_en_GB.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_en_GB.properties
index 9bc2601fb1d1..6097092c6b55 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_en_GB.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_en_GB.properties
@@ -28,7 +28,7 @@ site = site.
 
 this = This automatic notification message was sent by
 
-youcan = You can modify how you receive notifications at My Workspace > Preferences.
+youcan = You can modify how you receive notifications at Home > Preferences.
 
 db.subj.upd = [ {0} - Dropbox item changed in "{1}" ] {2}
 db.subj.new = [ {0} - New dropbox item in "{1}" ] {2}
@@ -37,4 +37,4 @@ db.text.upd = A resource has been updated in the dropbox for "{0}" in the "{1}"
 db.text.new = A new resource has been added to the dropbox for "{0}" in the "{1}" site at {2} ({3}) 
 
 db.text.location = Location: site "{0}" > Drop Box {1} > {2} 
-db.text.prefs = This automatic notification message was sent by {0} ({1}) from the dropbox in the {2} site. You can modify how you receive notifications at My Workspace > Preferences.
\ No newline at end of file
+db.text.prefs = This automatic notification message was sent by {0} ({1}) from the dropbox in the {2} site. You can modify how you receive notifications at Home > Preferences.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_sv.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_sv.properties
index df1ff0456f2b..b85f9b6e2834 100755
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_sv.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_sv.properties
@@ -28,7 +28,7 @@ site = .
 
 this = Denna notifiering skickades av
 
-youcan = Du kan \u00E4ndra hur du tar emot notifieringar i My Workspace > Preferences.
+youcan = Du kan \u00E4ndra hur du tar emot notifieringar i Home > Preferences.
 
 db.subj.upd = [ {0} - Fil \u00e4ndrad i inl\u00e4mningsmapp "{1}" ] {2}
 db.subj.new = [ {0} - Ny fil i inl\u00e4mningsmapp "{1}" ] {2}
@@ -38,4 +38,4 @@ db.text.new = En ny fil har lagts till i inl\u00e4mningsmappen f\u00f6r "{0}" p\
 
 db.text.location = Plats: sajt "{0}" > Inl\u00e4mningsmapp {1} > {2}
  
-db.text.prefs = Denna automatiska notifiering skickades av {0} ({1}) fr\u00e5n inl\u00e4mningsmappen p\u00e5 sajten {2}. Du kan \u00e4ndra hur du tar emot notifieringar i 'My Workspace/Min arbetsyta' > Preferences/Inst\u00e4llningar.
\ No newline at end of file
+db.text.prefs = Denna automatiska notifiering skickades av {0} ({1}) fr\u00e5n inl\u00e4mningsmappen p\u00e5 sajten {2}. Du kan \u00e4ndra hur du tar emot notifieringar i 'Home/Min arbetsyta' > Preferences/Inst\u00e4llningar.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_vi.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_vi.properties
index 045d6177b073..9f895253b0cd 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_vi.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_vi.properties
@@ -16,8 +16,8 @@ forthe=t\u1EEB
 chan=Thay \u0111\u1ED5i 
 separator=---------------------- 
 sitat=trang web t\u1EA1i 
-db.text.prefs=Th\u00F4ng b\u00E1o t\u1EF1 \u0111\u1ED9ng s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EB1ng {0} ({1}) t\u1EEB Dropbox trong trang web c\u1EE7a () 2. B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace Preferences&gt
-youcan=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. 
+db.text.prefs=Th\u00F4ng b\u00E1o t\u1EF1 \u0111\u1ED9ng s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EB1ng {0} ({1}) t\u1EEB Dropbox trong trang web c\u1EE7a () 2. B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home Preferences&gt
+youcan=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences. 
 locsit=V\u1ECB tr\u00ED\: trang web 
 descrip=M\u00F4 t\u1EA3\: 
 db.subj.new=[{0} - New dropbox item trong "{1}"] {2} 
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties
index f233bdee30b1..d83585031c88 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools.properties
@@ -22,7 +22,7 @@ systoolgroups.ungrouped.title = Not Grouped
 
 
 # Home is a special case, with no tool registration file
-sakai.home.title                                    = Home
+sakai.home.title                                    = Overview
 sakai.home.description                              = For viewing recent announcements, discussion, and chat items. 
 
 sakai.admin.prefs.description                       = An admin tool to view and modify any user's Preferences
@@ -62,8 +62,8 @@ sakai.gradebook.tool.title                          = Gradebook
 sakai.help.description                              = The Sakai Help Tool
 sakai.help.title                                    = Help Documentation
 sakai.iframe.description                            = For accessing internal resources or an external website within the site.
-sakai.iframe.myworkspace.description                = For displaying information about a user's My Workspace
-sakai.iframe.myworkspace.title                      = My Workspace Information Display
+sakai.iframe.myworkspace.description                = For displaying information about a user's Home
+sakai.iframe.myworkspace.title                      = Home Information Display
 sakai.iframe.service.description                    = For displaying information about this Service
 sakai.iframe.service.title                          = Service Information Display
 sakai.iframe.site.description                       = For displaying Site information
@@ -164,7 +164,7 @@ sakai.sitesetup.description                         = Modify your sites and crea
 sakai.sitesetup.title                               = Worksite Setup
 sakai.su.description                                = Tool for logging in as another user
 sakai.su.title                                      = Become User
-sakai.summary.calendar.description                  = Show a summary of calendar events in My Workspace
+sakai.summary.calendar.description                  = Show a summary of calendar events in Home
 sakai.summary.calendar.title                        = Calendar
 sakai.syllabus.description                          = For posting a summary outline and/or requirements for a site
 sakai.syllabus.title                                = Syllabus
@@ -232,7 +232,7 @@ sakai.lessonbuildertool.title=Lessons
 sakai.lessonbuildertool.description=For creating content modules and sequences; can be organized by week or unit
 
 sakai.dashboard.title= Dashboard
-sakai.dashboard.description= Unified My Workspace display of recent announcements, resources, assignments, calendar events, etc. 
+sakai.dashboard.description= Unified Home display of recent announcements, resources, assignments, calendar events, etc. 
 
 sakai.signup.title=Sign-up
 sakai.signup.description=For enabling online registration for meetings and other events
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ko.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ko.properties
index 04b632e45ee5..61f6782b889e 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ko.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ko.properties
@@ -227,4 +227,4 @@ sakai.lessonbuildertool.title=Lessons
 sakai.lessonbuildertool.description=For creating content modules and sequences; can be organized by week or unit
 
 sakai.dashboard.title= Dashboard
-sakai.dashboard.description= Unified My Workspace display of recent announcements, resources, assignments, calendar events, etc.
+sakai.dashboard.description= Unified Home display of recent announcements, resources, assignments, calendar events, etc.
diff --git a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_vi.properties b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_vi.properties
index e3e99744bd3a..c479b3d75b57 100644
--- a/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_vi.properties
+++ b/config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_vi.properties
@@ -96,7 +96,7 @@ sakai.privacy.title=T\u00ECnh tr\u1EA1ng b\u1EA3o m\u1EADt
 sakai.filepicker.title=Ch\u1ECDn File 
 sakai.siteinfo.description=\u0110\u1EC3 Xem th\u00F4ng tin worksite v\u00E0 tham gia trang web 
 sakai.admin.prefs.description=M\u1ED9t c\u00F4ng c\u1EE5 qu\u1EA3n tr\u1ECB \u0111\u1EC3 xem v\u00E0 s\u1EEDa \u0111\u1ED5i Tu\u1EF3 ch\u1ECDn b\u1EA5t k\u1EF3 c\u1EE7a ng\u01B0\u1EDDi d\u00F9ng 
-sakai.summary.calendar.description=Xem b\u1EA3n t\u00F3m t\u1EAFt l\u1ECBch c\u00E1c s\u1EF1 ki\u1EC7n  trong My Workspace 
+sakai.summary.calendar.description=Xem b\u1EA3n t\u00F3m t\u1EAFt l\u1ECBch c\u00E1c s\u1EF1 ki\u1EC7n  trong Home 
 sakai.preferences.title=Tu\u1EF3 ch\u1ECDn 
 sakai.iframe.site.description=\u0110\u1EC3 Xem c\u00E1c trang web th\u00F4ng tin 
 sakai.site.roster.description=\u0110\u1EC3 xem danh s\u00E1ch c\u00E1c trang web tham gia 
@@ -162,7 +162,7 @@ sakai.poll.description=\u0110\u1ED1i v\u1EDBi c\u00E1c cu\u1ED9c th\u0103m d\u00
 sakai.reports.description=B\u00E1o c\u00E1o 
 sakai.gradebook.testservice.title=D\u1ECBch v\u1EE5 Gradebook Test 
 osp.presTemplate.description=portfolio OSP Templates 
-sakai.iframe.myworkspace.description=\u0110\u1EC3 Xem th\u00F4ng tin v\u1EC1 m\u1ED9t ng\u01B0\u1EDDi s\u1EED d\u1EE5ng My Workspace 
+sakai.iframe.myworkspace.description=\u0110\u1EC3 Xem th\u00F4ng tin v\u1EC1 m\u1ED9t ng\u01B0\u1EDDi s\u1EED d\u1EE5ng Home 
 sakai.admin.prefs.title=L\u1EF1a ch\u1ECDn cho qu\u1EA3n l\u00FD 
 sakai.rwiki.description=\u0110\u1EC3 bi\u00EAn t\u1EADp h\u1EE3p t\u00E1c c\u1EE7a c\u00E1c trang v\u00E0 n\u1ED9i dung 
 sakai.metaobj.formView.title=Form View 
diff --git a/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication.properties b/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication.properties
index 125d592deb22..c92b1c7a578a 100644
--- a/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication.properties
+++ b/delegatedaccess/tool/src/java/org/sakaiproject/delegatedaccess/tool/DelegatedAccessApplication.properties
@@ -121,10 +121,10 @@ inactiveLegendText=No activity has been detected for this site
 legend=Legend:
 nodeIdParam=Set nodeId parameter if you know the node you want to update.  If let empty, entire tree will update.
 administrationTools=Admin Tools
-add.da.myworkspace=Add Delegated Access to My Workspaces
-add.da.myworkspace.desc=This adds the Delegated Access tool to all user's My Workspace sites for users who have any kind of permissions in Delegated Access.  By default, a user will have the Delegated Access tool added/removed when you update their permissions, however, sometimes you have to delete all My Workspaces to pick up a new My Workspace template.
+add.da.myworkspace=Add Delegated Access to Homes
+add.da.myworkspace.desc=This adds the Delegated Access tool to all user's Home sites for users who have any kind of permissions in Delegated Access.  By default, a user will have the Delegated Access tool added/removed when you update their permissions, however, sometimes you have to delete all Homes to pick up a new Home template.
 addDaMyworkspaceTitle=Add Delegated Access to MyWorkspaces
-success.addDaMyworkspace=You have successfully scheduled the job to add Delegated Access to user's My Workspace sites.
+success.addDaMyworkspace=You have successfully scheduled the job to add Delegated Access to user's Home sites.
 addDaMyworkspace.job.status.none=Never been scheduled.
 status=Status:
 na=N/A
@@ -198,4 +198,4 @@ filterBy=Filter By
 hierarchyLevel=Hierarchy Level
 filter=Filter
 clear=Clear
-modificationsPending=There are unsaved modifications that will be removed, please save or continue with action.
\ No newline at end of file
+modificationsPending=There are unsaved modifications that will be removed, please save or continue with action.
diff --git a/feedback/src/main/resources/org/sakaiproject/feedback.properties b/feedback/src/main/resources/org/sakaiproject/feedback.properties
index dc583698ca14..3e493dcb6a81 100644
--- a/feedback/src/main/resources/org/sakaiproject/feedback.properties
+++ b/feedback/src/main/resources/org/sakaiproject/feedback.properties
@@ -188,7 +188,7 @@ Summary\
 ----------------\
 {11}\
 {10}
-email_body_template_note = You can manage your visibility in this and other sites. To do this, visit My Workspace, select Preferences, then click on Privacy Status to control your visibility (in all tools) within a specified site. Please consider the impact that this will have on users of your site should they have a problem.
+email_body_template_note = You can manage your visibility in this and other sites. To do this, visit Home, select Preferences, then click on Privacy Status to control your visibility (in all tools) within a specified site. Please consider the impact that this will have on users of your site should they have a problem.
 email_success = An email with the information you entered has been sent to
 content_icon_no_translate=fa-exclamation-triangle
 ask_icon_no_translate=fa-comment-o
diff --git a/help/help-component/src/bundle/TutorialMessages.properties b/help/help-component/src/bundle/TutorialMessages.properties
index 9302d1f485f2..4ad060f22ee4 100644
--- a/help/help-component/src/bundle/TutorialMessages.properties
+++ b/help/help-component/src/bundle/TutorialMessages.properties
@@ -24,15 +24,15 @@ Let&#39;s introduce you to the basics of navigating the system.
 
 #Site Navigation panel
 introToSakai_sitenav.title=Site Navigation
-introToSakai_sitenav.body=Your sites are displayed as links across the top, starting with your own private My Workspace <span class="no-wrap">( <i class="fa fa-home tut-icon-home"></i> ).</span>\
+introToSakai_sitenav.body=Your sites are displayed as links across the top, starting with your own private Home <span class="no-wrap">( <i class="fa fa-home tut-icon-home"></i> ).</span>\
 <br/><br/>\
-My Workspace gives you an overview of the activity in your sites and allows you to personalize your {0} experience.
+Home gives you an overview of the activity in your sites and allows you to personalize your {0} experience.
 
 #Sites panel (narrow view only)
 introToSakai_allsites.title=Sites
 introToSakai_allsites.body=The <span class="no-wrap"><i class="fa fa-th tut-icon-sites"></i> Sites</span> button opens your sites drawer, which displays links to all of your visible sites organized by term or category.\
 <br/><br/>\
-From the sites drawer, you can star your most-used sites and access your own private site called My Workspace.
+From the sites drawer, you can star your most-used sites and access your own private site called Home.
 
 #Sites panel
 introToSakai_moreButton.title=Sites
@@ -74,4 +74,4 @@ That&#39;s it! If you&#39;d like to review this tutorial, you can restart it by
 
 #Return to Tutorial panel
 introToSakai_pTutorialLocation.title=Tutorial
-introToSakai_pTutorialLocation.body=You can restart this tutorial by choosing it from the Account Menu. 
\ No newline at end of file
+introToSakai_pTutorialLocation.body=You can restart this tutorial by choosing it from the Account Menu. 
diff --git a/help/help/src/sakai_screensteps_accessibilityInstructorGuide/Accessibility-Information.html b/help/help/src/sakai_screensteps_accessibilityInstructorGuide/Accessibility-Information.html
index ae94453a1ef6..6fc7286742c3 100644
--- a/help/help/src/sakai_screensteps_accessibilityInstructorGuide/Accessibility-Information.html
+++ b/help/help/src/sakai_screensteps_accessibilityInstructorGuide/Accessibility-Information.html
@@ -27,7 +27,7 @@ <h1 class="article-title">Accessibility Information</h1>
 
             <div id="article-description">
         <p>Sakai is a Learning Management System created to assist faculty and students by providing online tools for communication, assessment, content delivery, etc.</p>
-<p>Sakai is composed of sites, and each site has a number of tools selected by the site creator. There is also a special site, My Workspace, private to you, where you can access personal information and change your settings.</p>
+<p>Sakai is composed of sites, and each site has a number of tools selected by the site creator. There is also a special site, Home, private to you, where you can access personal information and change your settings.</p>
 <p>This document is assistive technology agnostic and will briefly describe the different areas of the interface, point out how they are implemented for accessibility, and go into more depth where extra assistance may be needed.</p>
 <p>If you need specific help with your assistive technology, please contact your institution's office for Disability Student Services and/or Information Technology Services.</p>
 <p>For additional information visit the <a href="https://confluence.sakaiproject.org/display/2ACC/Accessibility+Working+Group" target="_blank">Accessibility Working Group</a> on the Confluence Wiki.</p>
@@ -74,7 +74,7 @@ <h1 class="article-title">Accessibility Information</h1>
 <p>This list contains the menu links to sites you most commonly use. &nbsp;Each menu link will either take you to the site, or if you Tab into the menu and press the Down arrow key, supply you with a submenu of that site&rsquo;s tools so that you can go straight to that tool on the selected site.</p>
 <p>Using the Up and Down arrow keys, you can navigate the submenu to the site specific tool links. These links can be activated using the Enter key.</p>
 <p>If you have a large number of favorite sites in this list, some sites will not be displayed due to space limitations. Any sites not displayed are contained in a submenu accessed via the More Sites link (not shown in screen capture), which is the last link in the favorite sites list. &nbsp;</p>
-<p>The rest of the sites you may be a member of can be found in your My Workspace site, This site is always the first link in the favorite sites list, in the Worksite Setup tool .</p>
+<p>The rest of the sites you may be a member of can be found in your Home site, This site is always the first link in the favorite sites list, in the Worksite Setup tool .</p>
 </div>          </div>
           <div class="clear"></div>          <div id="step-6118" class="step-container">            <h3 class="step-title">The List of Tools for the Current Site</h3>                      <div class="step-image-container">
             <img src="/library/image/help/en/Accessibility-Information/The-List-of-Tools-for-the-Current-Site.png" width="188" height="192" class="step-image" alt="The List of Tools for the Current Site">
diff --git a/help/help/src/sakai_screensteps_announcementsInstructorGuide/What-is-the-Announcements-tool-.html b/help/help/src/sakai_screensteps_announcementsInstructorGuide/What-is-the-Announcements-tool-.html
index e3d7e621e4dc..4232fc1234dd 100644
--- a/help/help/src/sakai_screensteps_announcementsInstructorGuide/What-is-the-Announcements-tool-.html
+++ b/help/help/src/sakai_screensteps_announcementsInstructorGuide/What-is-the-Announcements-tool-.html
@@ -26,7 +26,7 @@ <h1 class="article-title">What is the Announcements tool?</h1>
       </div>
 
             <div id="article-description">
-        <p>The Announcements tool allows for the delivery of messages to the entire class, to groups, or to specific sections within the class. &nbsp;Participants will see the Announcement message displayed in the Announcements area of their "My Workspace" tab, as well as within the course itself. &nbsp;These messages can be set to show immediately, or to show during specific dates. &nbsp;Email notifications can be sent to alert participants of the Announcement message. </p>
+        <p>The Announcements tool allows for the delivery of messages to the entire class, to groups, or to specific sections within the class. &nbsp;Participants will see the Announcement message displayed in the Announcements area of their "Home" tab, as well as within the course itself. &nbsp;These messages can be set to show immediately, or to show during specific dates. &nbsp;Email notifications can be sent to alert participants of the Announcement message. </p>
       </div>      <div id="steps-container">          <div id="step-6232" class="step-container">            <h2 class="step-title">To access this tool, select Announcements from the Tool Menu in your site.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/What-is-the-Announcements-tool-/To-access-this-tool--select-Announcements-from-the.png" width="146" height="125" class="step-image" alt="To access this tool, select Announcements from the Tool Menu in your site.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_announcementsStudentGuide/How-do-I-view-announcements-.html b/help/help/src/sakai_screensteps_announcementsStudentGuide/How-do-I-view-announcements-.html
index 7b0bfc05197e..e06313f1570f 100644
--- a/help/help/src/sakai_screensteps_announcementsStudentGuide/How-do-I-view-announcements-.html
+++ b/help/help/src/sakai_screensteps_announcementsStudentGuide/How-do-I-view-announcements-.html
@@ -26,13 +26,13 @@ <h1 class="article-title">How do I view announcements?</h1>
       </div>
 
             <div id="article-description">
-        <p>Announcements in Sakai display in several locations. You can view them from My Workspace, from an individual course or project site, or from the Announcements tool.</p>
-      </div>      <div id="steps-container">          <div id="step-8011" class="step-container">            <h2 class="step-title">Viewing announcements in My Workspace.</h2>                      <div class="step-image-container step-image-fullsize">
-            <img src="/library/image/help/en/How-do-I-view-announcements-/Viewing-announcements-in-My-Workspace-sm.png" width="640" height="420" class="step-image" alt="Viewing announcements in My Workspace."><div class="step-image-caption">
+        <p>Announcements in Sakai display in several locations. You can view them from Home, from an individual course or project site, or from the Announcements tool.</p>
+      </div>      <div id="steps-container">          <div id="step-8011" class="step-container">            <h2 class="step-title">Viewing announcements in Home.</h2>                      <div class="step-image-container step-image-fullsize">
+            <img src="/library/image/help/en/How-do-I-view-announcements-/Viewing-announcements-in-My-Workspace-sm.png" width="640" height="420" class="step-image" alt="Viewing announcements in Home."><div class="step-image-caption">
               <a href="/library/image/help/en/How-do-I-view-announcements-/Viewing-announcements-in-My-Workspace.png" rel="featherlight" target="_blank">Zoom</a>
             </div>
           </div>
-            <div class="step-instructions"><p>When you are logged in to My Workspace, you will see your<strong> Recent Announcements</strong> displayed there. Your Recent Announcements in this location will show all announcements from all sites in which you are enrolled. </p></div>          </div>
+            <div class="step-instructions"><p>When you are logged in to Home, you will see your<strong> Recent Announcements</strong> displayed there. Your Recent Announcements in this location will show all announcements from all sites in which you are enrolled. </p></div>          </div>
           <div class="clear"></div>          <div id="step-8012" class="step-container">            <h3 class="step-title">Click on the announcement subject.</h3>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-view-announcements-/Click-on-the-announcement-subject.png" width="580" height="199" class="step-image" alt="Click on the announcement subject.">
 </div>          </div>
@@ -55,8 +55,8 @@ <h1 class="article-title">How do I view announcements?</h1>
             <img src="/library/image/help/en/How-do-I-view-announcements-/Viewing-announcements-via-the-Announcements-tool.png" width="171" height="130" class="step-image" alt="Viewing announcements via the Announcements tool.">
 </div>
             <div class="step-instructions">
-<p>You may also view your announcements by selecting the <strong>Announcements</strong> tool in the Tool Menu from My Workspace, or from within an individual course or project site.</p>
-<p><em>Note: Remember that My Workspace will display announcements from all courses.</em></p>
+<p>You may also view your announcements by selecting the <strong>Announcements</strong> tool in the Tool Menu from Home, or from within an individual course or project site.</p>
+<p><em>Note: Remember that Home will display announcements from all courses.</em></p>
 </div>          </div>
           <div class="clear"></div>          <div id="step-8018" class="step-container">            <h3 class="step-title">Click on the announcement subject.</h3>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/How-do-I-view-announcements-/Click-on-the-announcement-subject-2-sm.png" width="640" height="200" class="step-image" alt="Click on the announcement subject."><div class="step-image-caption">
diff --git a/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-create-a-new-course-or-project-site-.html b/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-create-a-new-course-or-project-site-.html
index 9ed6700c8bc1..3c119596afac 100644
--- a/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-create-a-new-course-or-project-site-.html
+++ b/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-create-a-new-course-or-project-site-.html
@@ -26,8 +26,8 @@ <h1 class="article-title">How do I create a new course or project site?</h1>
       </div>
 
             <div id="article-description">
-        <p>If you have the appropriate permissions to create new course or project sites, you may do so from either Worksite Setup or the More Sites tab in My Workspace.</p>
-      </div>      <div id="steps-container">          <div id="step-6211" class="step-container">            <h2 class="step-title">Go to Worksite Setup.</h2>            <div class="step-instructions"><p>Select the <strong>Worksite Setup</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+        <p>If you have the appropriate permissions to create new course or project sites, you may do so from either Worksite Setup or the More Sites tab in Home.</p>
+      </div>      <div id="steps-container">          <div id="step-6211" class="step-container">            <h2 class="step-title">Go to Worksite Setup.</h2>            <div class="step-instructions"><p>Select the <strong>Worksite Setup</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6212" class="step-container">            <h3 class="step-title">Click New. </h3>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-create-a-new-course-or-project-site-/Click-New-.png" width="261" height="74" class="step-image" alt="Click New. ">
 </div>          </div>
@@ -36,7 +36,7 @@ <h1 class="article-title">How do I create a new course or project site?</h1>
               <a href="/library/image/help/en/How-do-I-create-a-new-course-or-project-site-/Or--go-to-More-Sites.png" rel="featherlight" target="_blank">Zoom</a>
             </div>
           </div>
-            <div class="step-instructions"><p>Click on the <strong>More Sites</strong> tab in My Workspace to view your active sites drawer.</p></div>          </div>
+            <div class="step-instructions"><p>Click on the <strong>More Sites</strong> tab in Home to view your active sites drawer.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6214" class="step-container">            <h3 class="step-title">From your sites drawer, click Add New Site.</h3>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/How-do-I-create-a-new-course-or-project-site-/From-your-sites-drawer--click-Add-New-Site-sm.png" width="640" height="233" class="step-image" alt="From your sites drawer, click Add New Site."><div class="step-image-caption">
               <a href="/library/image/help/en/How-do-I-create-a-new-course-or-project-site-/From-your-sites-drawer--click-Add-New-Site.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-navigate-in-a-site-.html b/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-navigate-in-a-site-.html
index fa448352eb8a..0e39c822fe56 100644
--- a/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-navigate-in-a-site-.html
+++ b/help/help/src/sakai_screensteps_courseandProjectSitesInstructorGuide/How-do-I-navigate-in-a-site-.html
@@ -26,9 +26,9 @@ <h1 class="article-title">How do I navigate in a site?</h1>
       </div>
 
             <div id="article-description">
-        <p><a href="content.hlp?docId=whatisMyWorkspace">My Workspace</a> is your individual online workspace. When you first log in, you go to My Workspace automatically. To return to your workspace after visiting other sites, click My Workspace in the upper left corner of the screen. Additional course and project sites appear as tabs across the top of the screen. Click a tab to go to the corresponding site. </p>
+        <p><a href="content.hlp?docId=whatisMyWorkspace">Home</a> is your individual online workspace. When you first log in, you go to Home automatically. To return to your workspace after visiting other sites, click Home in the upper left corner of the screen. Additional course and project sites appear as tabs across the top of the screen. Click a tab to go to the corresponding site. </p>
 <p>It is strongly recommended that you use the site navigation, and not the back and forward buttons in your web browser, to navigate within a site.</p>
-<p><em>Note: If you are not yet a member of any sites, you will see only a My Workspace tab at the top of the screen. </em></p>
+<p><em>Note: If you are not yet a member of any sites, you will see only a Home tab at the top of the screen. </em></p>
       </div>      <div id="steps-container">          <div id="step-6205" class="step-container">            <h2 class="step-title">The Tool Menu.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-navigate-in-a-site-/The-Tool-Menu.png" width="150" height="516" class="step-image" alt="The Tool Menu.">
 </div>
@@ -36,10 +36,10 @@ <h1 class="article-title">How do I navigate in a site?</h1>
 <p>The <strong>Tool Menu</strong> is a customizable column along the left side of the screen with links for each available tool (e.g., Announcements, Forums, etc.). The number of links will vary depending on which tools were chosen for a site. Menu colors and icons may also vary depending on the theme or skin chosen for your site. </p>
 <p>Click the tool's name to go to the corresponding tool. </p>
 </div>          </div>
-          <div class="clear"></div>          <div id="step-6206" class="step-container">            <h2 class="step-title">The site Home page.</h2>                      <div class="step-image-container">
-            <img src="/library/image/help/en/How-do-I-navigate-in-a-site-/The-site-Home-page.png" width="150" height="41" class="step-image" alt="The site Home page.">
+          <div class="clear"></div>          <div id="step-6206" class="step-container">            <h2 class="step-title">The site Overview page.</h2>                      <div class="step-image-container">
+            <img src="/library/image/help/en/How-do-I-navigate-in-a-site-/The-site-Home-page.png" width="150" height="41" class="step-image" alt="The site Overview page.">
 </div>
-            <div class="step-instructions"><p><strong>Home</strong> on the Tool Menu takes you to the home page for the site you're in. Home pages can contain a list of recent announcements, recent discussion items, calendar posts and other selected resources. </p></div>          </div>
+            <div class="step-instructions"><p><strong>Overview</strong> on the Tool Menu takes you to the home page for the site you're in. Overview pages can contain a list of recent announcements, recent discussion items, calendar posts and other selected resources. </p></div>          </div>
           <div class="clear"></div>          <div id="step-6207" class="step-container">            <h2 class="step-title">The Reset button.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-navigate-in-a-site-/The-Reset-button.png" width="29" height="26" class="step-image" alt="The Reset button.">
 </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-access-a-site-via-delegated-access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-access-a-site-via-delegated-access-.html
index 4750810b67c2..a9cf968fc3fd 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-access-a-site-via-delegated-access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-access-a-site-via-delegated-access-.html
@@ -26,7 +26,7 @@ <h1 class="article-title">How do I access a site via delegated access?</h1>
       </div>
 
             <div id="steps-container">          <div id="step-5953" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions">
-<p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own My Workspace site.</p>
+<p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own Home site.</p>
 <p><em>Tip: If you are already in the Delegated Access tool, click the </em><em><strong>Delegated Access</strong></em><em> button in the menu bar.</em></p>
 </div>          </div>
           <div class="clear"></div>          <div id="step-5954" class="step-container">            <h2 class="step-title">Find site.</h2>            <div class="step-instructions">
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-delegate-site-access-to-a-user-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-delegate-site-access-to-a-user-.html
index 00b3b7295637..987bc6770869 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-delegate-site-access-to-a-user-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-delegate-site-access-to-a-user-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I delegate site access to a user?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-5932" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own My Workspace site.</p></div>          </div>
+            <div id="steps-container">          <div id="step-5932" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own Home site.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5933" class="step-container">            <h2 class="step-title">Find and select user.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-delegate-site-access-to-a-user-/Find-and-select-user.png" width="447" height="213" class="step-image" alt="Find and select user.">
 </div>
@@ -61,7 +61,7 @@ <h1 class="article-title">How do I delegate site access to a user?</h1>
 </ol>
 </div>          </div>
           <div class="clear"></div>          <div id="step-5937" class="step-container">            <h2 class="step-title">Add Become User tool</h2>            <div class="step-instructions">
-<p>Optionally, enable access to the <em>Become User</em> tool. The tool will be added to the user's My Workspace. &nbsp;</p>
+<p>Optionally, enable access to the <em>Become User</em> tool. The tool will be added to the user's Home. &nbsp;</p>
 <ol>
 <li>Click <strong>Advanced</strong>.</li>
 <li>In the window that displays, enable the setting.</li>
@@ -71,7 +71,7 @@ <h1 class="article-title">How do I delegate site access to a user?</h1>
 </div>          </div>
           <div class="clear"></div>          <div id="step-5938" class="step-container">            <h2 class="step-title">Save settings</h2>            <div class="step-instructions">
 <p>Click <strong>Save</strong>. A "Successfully saved" message displays. </p>
-<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's My Workspace, along with <em>Become User</em> if you also enabled access to that tool.</p>
+<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's Home, along with <em>Become User</em> if you also enabled access to that tool.</p>
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-edit-user-permissions-in-Delegated-Access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-edit-user-permissions-in-Delegated-Access-.html
index bfdf12748366..70e29bb3896c 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-edit-user-permissions-in-Delegated-Access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-edit-user-permissions-in-Delegated-Access-.html
@@ -28,7 +28,7 @@ <h1 class="article-title">How do I edit user permissions in Delegated Access?</h
             <div id="steps-container">          <div id="step-5939" class="step-container">            <h2 class="step-title">Go to Delegated Access tool</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-edit-user-permissions-in-Delegated-Access-/Go-to-Delegated-Access-tool.png" width="173" height="68" class="step-image" alt="Go to Delegated Access tool">
 </div>
-            <div class="step-instructions"><p>In the Administration Workspace or in your own My Workspace site, click <strong>Delegated Access</strong> in the Tool Menu. </p></div>          </div>
+            <div class="step-instructions"><p>In the Administration Workspace or in your own Home site, click <strong>Delegated Access</strong> in the Tool Menu. </p></div>          </div>
           <div class="clear"></div>          <div id="step-5940" class="step-container">            <h2 class="step-title">Find and select user.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-edit-user-permissions-in-Delegated-Access-/Find-and-select-user.png" width="447" height="213" class="step-image" alt="Find and select user.">
 </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-delegated-access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-delegated-access-.html
index 1517b92ebd50..160b1be5d4a2 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-delegated-access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-delegated-access-.html
@@ -26,7 +26,7 @@ <h1 class="article-title">How do I let a non-admin manage delegated access? </h1
       </div>
 
             <div id="article-description">
-        <p>You may want to let a non-admin user manage delegated access for other users. To do so, you can add this capability to the Delegated Access tool you make available in the non-admin user's My Workspace.</p>
+        <p>You may want to let a non-admin user manage delegated access for other users. To do so, you can add this capability to the Delegated Access tool you make available in the non-admin user's Home.</p>
       </div>      <div id="steps-container">          <div id="step-5922" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu in the Administration Workspace. </p></div>          </div>
           <div class="clear"></div>          <div id="step-5923" class="step-container">            <h2 class="step-title">Find and select user</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-let-a-non-admin-manage-delegated-access-/Find-and-select-user.png" width="447" height="213" class="step-image" alt="Find and select user">
@@ -49,7 +49,7 @@ <h1 class="article-title">How do I let a non-admin manage delegated access? </h1
           <div class="clear"></div>          <div id="step-5925" class="step-container">            <h2 class="step-title">Set admin capability.</h2>            <div class="step-instructions"><p>For a particular node, check <strong>Access Admin</strong>.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5926" class="step-container">            <h2 class="step-title">Save settings</h2>            <div class="step-instructions">
 <p>Click <strong>Save</strong>. A "Successfully saved" message displays. </p>
-<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's My Workspace. In the tool, the user will see <em>Search by User</em> and <em>Search by Access</em> buttons for managing delegated access for other users.</p>
+<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's Home. In the tool, the user will see <em>Search by User</em> and <em>Search by Access</em> buttons for managing delegated access for other users.</p>
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-shopping-period-access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-shopping-period-access-.html
index df92e582bd64..88916dc7bf33 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-shopping-period-access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-let-a-non-admin-manage-shopping-period-access-.html
@@ -26,8 +26,8 @@ <h1 class="article-title">How do I let a non-admin manage shopping period access
       </div>
 
             <div id="article-description">
-        <p>You may want to let a non-admin user manage shopping period access for other users. To do so, you can add this capability to the Delegated Access tool you make available in the non-admin user's My Workspace.</p>
-      </div>      <div id="steps-container">          <div id="step-5927" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own My Workspace site.</p></div>          </div>
+        <p>You may want to let a non-admin user manage shopping period access for other users. To do so, you can add this capability to the Delegated Access tool you make available in the non-admin user's Home.</p>
+      </div>      <div id="steps-container">          <div id="step-5927" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own Home site.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5928" class="step-container">            <h2 class="step-title">Find and select user.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-let-a-non-admin-manage-shopping-period-access-/Find-and-select-user.png" width="447" height="213" class="step-image" alt="Find and select user.">
 </div>
@@ -49,7 +49,7 @@ <h1 class="article-title">How do I let a non-admin manage shopping period access
           <div class="clear"></div>          <div id="step-5930" class="step-container">            <h2 class="step-title">Set admin capability.</h2>            <div class="step-instructions"><p>For a particular node, check <strong>Shopping Admin</strong>.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5931" class="step-container">            <h2 class="step-title">Save settings.</h2>            <div class="step-instructions">
 <p>Click <strong>Save</strong>. A "Successfully saved" message displays. </p>
-<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's My Workspace. In the tool, the user will see <em>Shopping Admin </em>and<em> Shopping List </em>buttons for managing shopping period access for other users.</p>
+<p>If the user has no previous delegated access permissions enabled, the <em>Delegated Access</em> tool gets added to the user's Home. In the tool, the user will see <em>Shopping Admin </em>and<em> Shopping List </em>buttons for managing shopping period access for other users.</p>
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-remove-user-permissions-in-Delegated-Access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-remove-user-permissions-in-Delegated-Access-.html
index a04863689798..19b253cf2bf4 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-remove-user-permissions-in-Delegated-Access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-remove-user-permissions-in-Delegated-Access-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I remove user permissions in Delegated Access?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-5944" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own My Workspace site.</p></div>          </div>
+            <div id="steps-container">          <div id="step-5944" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own Home site.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5945" class="step-container">            <h2 class="step-title">Find and select user.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-remove-user-permissions-in-Delegated-Access-/Find-and-select-user.png" width="447" height="213" class="step-image" alt="Find and select user.">
 </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-search-users-in-Delegated-Access-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-search-users-in-Delegated-Access-.html
index 632f11e9a6df..129084779dc6 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-search-users-in-Delegated-Access-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-search-users-in-Delegated-Access-.html
@@ -29,7 +29,7 @@ <h1 class="article-title">How do I search users in Delegated Access?</h1>
         <p>In the Delegated Access tool, you can search for any user in your Sakai instance, so you can then add, edit, or remove access permissions for a particular user. There are two ways to search for users:</p>
 <p>&bull;	<strong>Search by user</strong>--search by user name or user ID &nbsp;</p>
 <p>&bull;	<strong>Search by hierarchy</strong>--search all users by access permissions for particular hierarchy nodes</p>
-      </div>      <div id="steps-container">          <div id="step-5948" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own My Workspace site.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-5948" class="step-container">            <h2 class="step-title">Go to Delegated Access tool.</h2>            <div class="step-instructions"><p>Select <strong>Delegated Access</strong> from the Tool Menu of the Administration Workspace or in your own Home site.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5949" class="step-container">            <h2 class="step-title">Search by user.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-search-users-in-Delegated-Access-/Search-by-user.png" width="447" height="213" class="step-image" alt="Search by user.">
 </div>
diff --git a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-set-a-shopping-period-.html b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-set-a-shopping-period-.html
index 954e91f5b537..1d897279165f 100644
--- a/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-set-a-shopping-period-.html
+++ b/help/help/src/sakai_screensteps_delegatedAccessAdministratorGuide/How-do-I-set-a-shopping-period-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I set a shopping period?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-5861" class="step-container">            <h2 class="step-title">Go to Delegated Access tool</h2>            <div class="step-instructions"><p>Select the <strong>Delegated Access</strong> too from the Tool Menu in the Administration Workspace or in your own My Workspace site.</p></div>          </div>
+            <div id="steps-container">          <div id="step-5861" class="step-container">            <h2 class="step-title">Go to Delegated Access tool</h2>            <div class="step-instructions"><p>Select the <strong>Delegated Access</strong> too from the Tool Menu in the Administration Workspace or in your own Home site.</p></div>          </div>
           <div class="clear"></div>          <div id="step-5862" class="step-container">            <h2 class="step-title">Go to shopping period settings</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-set-a-shopping-period-/Go-to-shopping-period-settings.png" width="278" height="64" class="step-image" alt="Go to shopping period settings">
 </div>
diff --git a/help/help/src/sakai_screensteps_emailArchiveInstructorGuide/What-is-the-Email-Archive-tool-.html b/help/help/src/sakai_screensteps_emailArchiveInstructorGuide/What-is-the-Email-Archive-tool-.html
index 289a9681b98e..5cab70f963ad 100644
--- a/help/help/src/sakai_screensteps_emailArchiveInstructorGuide/What-is-the-Email-Archive-tool-.html
+++ b/help/help/src/sakai_screensteps_emailArchiveInstructorGuide/What-is-the-Email-Archive-tool-.html
@@ -27,7 +27,7 @@ <h1 class="article-title">What is the Email Archive tool?</h1>
 
             <div id="article-description">
         <p>The Email Archive tool allows site managers to specify an alias email address which essentially serves as a listserv for the site. By default, email you send to the site email address is copied to the email addresses of all site participants and owners. All email messages sent to your site's email address are stored in the Email Archive. You can use any email program to send mail to the email address listed at the top of your Email Archive page. </p>
-<p>Site members can use <a href="content.hlp?docId=whatisthePreferencestool">Preferences</a> in My Workspace to choose how often they want to receive email sent to the site's email address: either as it is sent, or in digest mode, with all posts for the day sent in a single email message. </p>
+<p>Site members can use <a href="content.hlp?docId=whatisthePreferencestool">Preferences</a> in Home to choose how often they want to receive email sent to the site's email address: either as it is sent, or in digest mode, with all posts for the day sent in a single email message. </p>
 <p><em>Note: You cannot use Email Archive to send mail to particular individuals. To send messages to individual participants or a group, use either the </em><em><a href="content.hlp?docId=whatistheMessagestool">Messages</a></em><em> tool (for internal course mail) or the </em><em><a href="content.hlp?docId=whatistheEmailtool">Email</a></em><em> tool (for external institutional mail).</em></p>
       </div>      <div id="steps-container">          <div id="step-6389" class="step-container">            <h2 class="step-title">To access this tool, select Email Archive from the Tool Menu in your site.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/What-is-the-Email-Archive-tool-/To-access-this-tool--select-Email-Archive-from-the.png" width="136" height="110" class="step-image" alt="To access this tool, select Email Archive from the Tool Menu in your site.">
diff --git a/help/help/src/sakai_screensteps_forumsInstructorGuide/What-is-the-Forums-tool-.html b/help/help/src/sakai_screensteps_forumsInstructorGuide/What-is-the-Forums-tool-.html
index 7cc9569648c0..c8fd8b12dea2 100644
--- a/help/help/src/sakai_screensteps_forumsInstructorGuide/What-is-the-Forums-tool-.html
+++ b/help/help/src/sakai_screensteps_forumsInstructorGuide/What-is-the-Forums-tool-.html
@@ -37,7 +37,8 @@ <h1 class="article-title">What is the Forums tool?</h1>
 <li>
 <strong>Moderation: </strong>Instructors can choose to moderate messages posted to topics.</li>
 <li>
-<strong>Counts of unread posts at a glance</strong>: On your site's Home page (select Home on the site's menubar), you can see how many unread messages or posts you have in both Messages and Forums. From My Workspace, you can see these totals for all sites in which you are enrolled.</li>
+<strong>Counts of unread posts at a glance</strong>: On your site's Overview page (select Overview on the site's menubar), you can see how many unread messages or posts you have in both Messages and Forums. From Home, you can see these totals for all sites in which you are enrolled.</li>
+
 <li>
 <strong>Email notifications</strong>: Site members can elect to receive no email notification, notification for all new postings in a site, or notification for responses to conversations they've posted in. The default is to receive notifications about new postings in conversations to which you have contributed.</li>
 <li>
diff --git a/help/help/src/sakai_screensteps_mOTDAnnouncementsAdministratorGuide/What-is-the-admin-Announcements-tool-or-Message-of-the-Day--MOTD--.html b/help/help/src/sakai_screensteps_mOTDAnnouncementsAdministratorGuide/What-is-the-admin-Announcements-tool-or-Message-of-the-Day--MOTD--.html
index 019f198e3a30..c3336be9dfa1 100644
--- a/help/help/src/sakai_screensteps_mOTDAnnouncementsAdministratorGuide/What-is-the-admin-Announcements-tool-or-Message-of-the-Day--MOTD--.html
+++ b/help/help/src/sakai_screensteps_mOTDAnnouncementsAdministratorGuide/What-is-the-admin-Announcements-tool-or-Message-of-the-Day--MOTD--.html
@@ -26,7 +26,7 @@ <h1 class="article-title">What is the admin Announcements tool or Message of the
       </div>
 
             <div id="article-description">
-        <p>In the Home area of&nbsp;My Workspace, you will see announcements from your system administrator under "Message of the Day" (MOTD). The MOTD is typically used for system-wide announcements to inform users about upcoming events or important information. &nbsp;</p>
+        <p>In the Overview area of&nbsp;Home, you will see announcements from your system administrator under "Message of the Day" (MOTD). The MOTD is typically used for system-wide announcements to inform users about upcoming events or important information. &nbsp;</p>
 <p>System administrators access the MOTD functions using the Announcements tool in the Administration Workspace. &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</p>
       </div>      <div id="steps-container">          <div id="step-5869" class="step-container">            <h2 class="step-title">View the MOTD.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-the-admin-Announcements-tool-or-Message-of-the-Day--MOTD--/View-the-MOTD-sm.png" width="640" height="390" class="step-image" alt="View the MOTD."><div class="step-image-caption">
diff --git a/help/help/src/sakai_screensteps_messagesInstructorGuide/What-is-the-Messages-tool-.html b/help/help/src/sakai_screensteps_messagesInstructorGuide/What-is-the-Messages-tool-.html
index d7412c8fffcb..f02b38d7b729 100644
--- a/help/help/src/sakai_screensteps_messagesInstructorGuide/What-is-the-Messages-tool-.html
+++ b/help/help/src/sakai_screensteps_messagesInstructorGuide/What-is-the-Messages-tool-.html
@@ -34,7 +34,7 @@ <h1 class="article-title">What is the Messages tool?</h1>
           <div class="clear"></div>          <div id="step-6801" class="step-container">            <h3 class="step-title">Or, go to Messages directly from your Message Center Notification links.</h3>                      <div class="step-image-container">
             <img src="/library/image/help/en/What-is-the-Messages-tool-/Or--go-to-Messages-directly-from-your-Message-Cent.png" width="516" height="124" class="step-image" alt="Or, go to Messages directly from your Message Center Notification links.">
 </div>
-            <div class="step-instructions"><p>You may also click on the new message number indicator or envelope icon from the Message Center Notifications shown in My Workspace to go directly to Messages for a given site. </p></div>          </div>
+            <div class="step-instructions"><p>You may also click on the new message number indicator or envelope icon from the Message Center Notifications shown in Home to go directly to Messages for a given site. </p></div>          </div>
           <div class="clear"></div>      </div>      
     </div>
     
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/How-do-I-view-and-edit-my-account-details-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/How-do-I-view-and-edit-my-account-details-.html
index 7fc70f4db916..edaf88aaedfb 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/How-do-I-view-and-edit-my-account-details-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/How-do-I-view-and-edit-my-account-details-.html
@@ -28,7 +28,7 @@ <h1 class="article-title">How do I view and edit my account details?</h1>
             <div id="article-description">
         <p>Your account details include your User Id, Name, Email, and Password for the system. In most cases, this information is automatically populated by your institution's student information system. However, if you have permission to change your Sakai password, this is where you would do it. You may also update your name and email address here if desired.</p>
 <p><em>Note: If this information is being updated automatically by the institution, any changes you make here may be overwritten, depending on the user permissions allowed by your institution.</em></p>
-      </div>      <div id="steps-container">          <div id="step-6186" class="step-container">            <h2 class="step-title">Go to Account to view and edit details.</h2>            <div class="step-instructions"><p>Click on the <strong>Account</strong> link in your My Workspace Tools Menu.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6186" class="step-container">            <h2 class="step-title">Go to Account to view and edit details.</h2>            <div class="step-instructions"><p>Click on the <strong>Account</strong> link in your Home Tools Menu.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6187" class="step-container">            <h2 class="step-title">Modifying account details.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-view-and-edit-my-account-details-/Modifying-account-details.png" width="292" height="409" class="step-image" alt="Modifying account details.">
 </div>
@@ -37,7 +37,7 @@ <h1 class="article-title">How do I view and edit my account details?</h1>
             <img src="/library/image/help/en/How-do-I-view-and-edit-my-account-details-/Changing-your-name--email-or-password.png" width="484" height="494" class="step-image" alt="Changing your name, email or password.">
 </div>
             <div class="step-instructions">
-<p>You may change any of the editable fields on this page. &nbsp;The password fields always appear blank upon accessing this screen. &nbsp;You may change your Sakai password by entering your current and new passwords in the fields provided. &nbsp;Changing your password here will change it for all of your sites on this system. &nbsp;Once you have entered your changes, select the <strong>Update Details</strong> button to save the change and return to My Workspace.</p>
+<p>You may change any of the editable fields on this page. &nbsp;The password fields always appear blank upon accessing this screen. &nbsp;You may change your Sakai password by entering your current and new passwords in the fields provided. &nbsp;Changing your password here will change it for all of your sites on this system. &nbsp;Once you have entered your changes, select the <strong>Update Details</strong> button to save the change and return to Home.</p>
 <p><em>Note that your Sakai User Id cannot be changed. &nbsp;Your User Id can only be modified by a Sakai Administrator at your institution.</em></p>
 </div>          </div>
           <div class="clear"></div>      </div>      
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Message-Center-Notifications-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Message-Center-Notifications-.html
index 918514ce3093..073dd10c1b3e 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Message-Center-Notifications-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Message-Center-Notifications-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What are the My Workspace Message Center Notifications?</title>
+<title>What are the Home Message Center Notifications?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.synoptic.messagecenter" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,11 +22,11 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What are the My Workspace Message Center Notifications?</h1>
+        <h1 class="article-title">What are the Home Message Center Notifications?</h1>
       </div>
 
             <div id="article-description">
-        <p>The Message Center in My Workspace displays the count of Messages and Forum posts for all of the sites in which you are enrolled. New messages are indicated by a number and envelope icon. If there are no new messages or posts, the word "none" will be displayed.</p>
+        <p>The Message Center in Home displays the count of Messages and Forum posts for all of the sites in which you are enrolled. New messages are indicated by a number and envelope icon. If there are no new messages or posts, the word "none" will be displayed.</p>
 <ul>
 <li>Clicking on the title of the site will take you to the homepage for that site.</li>
 <li>Clicking on the New Messages indicator will take you directly to the Message Inbox for that site.</li>
@@ -41,8 +41,8 @@ <h1 class="article-title">What are the My Workspace Message Center Notifications
             <img src="/library/image/help/en/What-are-the-My-Workspace-Message-Center-Notifications-/Customize-message-center-display--Optional-.png" width="550" height="160" class="step-image" alt="Customize message center display. (Optional)">
 </div>
             <div class="step-instructions"><p>You may click on the <strong>Options</strong> button to customize the list of sites displayed in the Message Center area.</p></div>          </div>
-          <div class="clear"></div>          <div id="step-6181" class="step-container">            <h3 class="step-title">My Workspace: Message Center Notifications - Display Options</h3>                      <div class="step-image-container">
-            <img src="/library/image/help/en/What-are-the-My-Workspace-Message-Center-Notifications-/My-Workspace--Message-Center-Notifications---Displ.png" width="614" height="281" class="step-image" alt="My Workspace: Message Center Notifications - Display Options">
+          <div class="clear"></div>          <div id="step-6181" class="step-container">            <h3 class="step-title">Home: Message Center Notifications - Display Options</h3>                      <div class="step-image-container">
+            <img src="/library/image/help/en/What-are-the-My-Workspace-Message-Center-Notifications-/My-Workspace--Message-Center-Notifications---Displ.png" width="614" height="281" class="step-image" alt="Home: Message Center Notifications - Display Options">
 </div>
             <div class="step-instructions"><p>Click in the<strong> Don't Show</strong> box to place a check mark next to any sites that you prefer not to see in the Message Center list and then click <strong>Update</strong>. If you have already hidden sites in Preferences, they will not show up in this list.</p></div>          </div>
           <div class="clear"></div>      </div>      
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Recent-Announcements-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Recent-Announcements-.html
index 0e0b77c920cb..546b2f04d7b8 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Recent-Announcements-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Recent-Announcements-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What are the My Workspace Recent Announcements?</title>
+<title>What are the Home Recent Announcements?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.myworkspace.announcements" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,11 +22,11 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What are the My Workspace Recent Announcements?</h1>
+        <h1 class="article-title">What are the Home Recent Announcements?</h1>
       </div>
 
             <div id="article-description">
-        <p>The Announcements area in My Workspace displays announcements from all of the sites in which you are enrolled. You may use the drop-down menu to view All items, Public items only, or items By Group. (You must be a member of a group in order to see group announcements.)</p>
+        <p>The Announcements area in Home displays announcements from all of the sites in which you are enrolled. You may use the drop-down menu to view All items, Public items only, or items By Group. (You must be a member of a group in order to see group announcements.)</p>
       </div>      <div id="steps-container">          <div id="step-6177" class="step-container">            <h2 class="step-title">View recent announcements.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-are-the-My-Workspace-Recent-Announcements-/View-recent-announcements-sm.png" width="640" height="414" class="step-image" alt="View recent announcements."><div class="step-image-caption">
               <a href="/library/image/help/en/What-are-the-My-Workspace-Recent-Announcements-/View-recent-announcements.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-Resources-in-My-Workspace-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-Resources-in-My-Workspace-.html
index b45262f8781b..8894a9990929 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-Resources-in-My-Workspace-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-Resources-in-My-Workspace-.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What are the Resources in My Workspace?</title>
+<title>What are the Resources in Home?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.resources" name="description">
 <meta content="Resources, MyWorkspace" name="search">
@@ -22,18 +22,18 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What are the Resources in My Workspace?</h1>
+        <h1 class="article-title">What are the Resources in Home?</h1>
       </div>
 
             <div id="article-description">
-        <p>Resources are available in both My Workspace and course sites. The Resources tool is site-dependent; the content uploaded in the My Workspace area is private and visible only to the user (unless the user chooses to make items public). </p>
-<p>The Resources tool in My Workspace serves as a personal file space for the user to save, store, and organize files. </p>
+        <p>Resources are available in both Home and course sites. The Resources tool is site-dependent; the content uploaded in the Home area is private and visible only to the user (unless the user chooses to make items public). </p>
+<p>The Resources tool in Home serves as a personal file space for the user to save, store, and organize files. </p>
 <p>The features and functionality of the Resources tool are the same in any site where the tool appears. Please refer to <a href="content.hlp?docId=whatistheResourcestool">What is the Resources tool?</a> for more information on how to manage files using this tool.</p>
-<p><em>Note: Your institution may limit the user file storage quota and/or access to Resources in My Workspace.</em></p>
-      </div>      <div id="steps-container">          <div id="step-6202" class="step-container">            <h2 class="step-title">To access this tool, select Resources from the Tool Menu in My Workspace.</h2>                      <div class="step-image-container">
-            <img src="/library/image/help/en/What-are-the-Resources-in-My-Workspace-/To-access-this-tool--select-Resources-from-the-Too.png" width="155" height="112" class="step-image" alt="To access this tool, select Resources from the Tool Menu in My Workspace.">
+<p><em>Note: Your institution may limit the user file storage quota and/or access to Resources in Home.</em></p>
+      </div>      <div id="steps-container">          <div id="step-6202" class="step-container">            <h2 class="step-title">To access this tool, select Resources from the Tool Menu in Home.</h2>                      <div class="step-image-container">
+            <img src="/library/image/help/en/What-are-the-Resources-in-My-Workspace-/To-access-this-tool--select-Resources-from-the-Too.png" width="155" height="112" class="step-image" alt="To access this tool, select Resources from the Tool Menu in Home.">
 </div>
-            <div class="step-instructions"><p><em>Tip: Users who would like to store large files in a single location may choose to store files in My Workspace and link to them from their other course sites, rather than uploading them to multiple locations. </em></p></div>          </div>
+            <div class="step-instructions"><p><em>Tip: Users who would like to store large files in a single location may choose to store files in Home and link to them from their other course sites, rather than uploading them to multiple locations. </em></p></div>          </div>
           <div class="clear"></div>      </div>      
     </div>
     
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Membership-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Membership-.html
index 9ed36cd5964c..023f0e6e184a 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Membership-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Membership-.html
@@ -26,10 +26,10 @@ <h1 class="article-title">What is Membership?</h1>
       </div>
 
             <div id="article-description">
-        <p>The Membership tool in My Workspace displays the list of sites in which a user is currently enrolled. </p>
+        <p>The Membership tool in Home displays the list of sites in which a user is currently enrolled. </p>
 <p>Users may search their enrolled courses or enroll in a joinable site from the Membership tool.</p>
 <p><em>Note: Unpublished sites are only visible to site managers (i.e. instructors or admin users). </em></p>
-      </div>      <div id="steps-container">          <div id="step-6182" class="step-container">            <h2 class="step-title">Go to Membership.</h2>            <div class="step-instructions"><p>Click on the <strong>Membership</strong> tool in the Tool in My Workspace to access your list of sites.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6182" class="step-container">            <h2 class="step-title">Go to Membership.</h2>            <div class="step-instructions"><p>Click on the <strong>Membership</strong> tool in the Tool in Home to access your list of sites.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6183" class="step-container">            <h2 class="step-title">Viewing current sites. </h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-Membership-/Viewing-current-sites--sm.png" width="640" height="433" class="step-image" alt="Viewing current sites. "><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-Membership-/Viewing-current-sites-.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-My-Workspace-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-My-Workspace-.html
index cdcb05e397d9..50bb1f7579a4 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-My-Workspace-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-My-Workspace-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What is My Workspace?</title>
+<title>What is Home?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.iframe.myworkspace" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,28 +22,28 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What is My Workspace?</h1>
+        <h1 class="article-title">What is Home?</h1>
       </div>
 
             <div id="article-description">
-        <p>When you log in to Sakai, you will immediately see My Workspace, your individual workspace in the system. My Workspace displays the Message of the Day as well as course announcements, calendar, and message notifications. You will also see links to account utilities, enrolled courses, and other system-wide resources.</p>
-<p><em>Note: The default location and availability of items in My Workspace may be customized by your institution.</em></p>
-      </div>      <div id="steps-container">          <div id="step-6165" class="step-container">            <h2 class="step-title">My Workspace Navigation and Display</h2>                      <div class="step-image-container step-image-fullsize">
-            <img src="/library/image/help/en/What-is-My-Workspace-/My-Workspace-Navigation-and-Display-sm.png" width="640" height="358" class="step-image" alt="My Workspace Navigation and Display"><div class="step-image-caption">
+        <p>When you log in to Sakai, you will immediately see Home, your individual workspace in the system. Home displays the Message of the Day as well as course announcements, calendar, and message notifications. You will also see links to account utilities, enrolled courses, and other system-wide resources.</p>
+<p><em>Note: The default location and availability of items in Home may be customized by your institution.</em></p>
+      </div>      <div id="steps-container">          <div id="step-6165" class="step-container">            <h2 class="step-title">Home Navigation and Display</h2>                      <div class="step-image-container step-image-fullsize">
+            <img src="/library/image/help/en/What-is-My-Workspace-/My-Workspace-Navigation-and-Display-sm.png" width="640" height="358" class="step-image" alt="Home Navigation and Display"><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-My-Workspace-/My-Workspace-Navigation-and-Display.png" rel="featherlight" target="_blank">Zoom</a>
             </div>
           </div>
             <div class="step-instructions">
-<p>My Workspace consists of the following navigation and display elements:</p>
+<p>Home consists of the following navigation and display elements:</p>
 <ol>
 <li><a href="content.hlp?docId=whatisSiteNavigation">Site Navigation across the top</a></li>
 <li><a href="content.hlp?docId=whatistheMyWorkspaceToolMenu">The Tool Menu on the left</a></li>
 <li><a href="content.hlp?docId=whatistheMyWorkspaceMessageoftheDay">The Message of the Day</a></li>
-<li><a href="content.hlp?docId=whatistheMyWorkspaceCalendar">My Workspace: Calendar</a></li>
-<li><a href="content.hlp?docId=whataretheMyWorkspaceRecentAnnouncements">My Workspace: Recent Announcements</a></li>
-<li><a href="content.hlp?docId=whataretheMyWorkspaceMessageCenterNotifications">My Workspace: Message Center Notifications</a></li>
+<li><a href="content.hlp?docId=whatistheMyWorkspaceCalendar">Home: Calendar</a></li>
+<li><a href="content.hlp?docId=whataretheMyWorkspaceRecentAnnouncements">Home: Recent Announcements</a></li>
+<li><a href="content.hlp?docId=whataretheMyWorkspaceMessageCenterNotifications">Home: Message Center Notifications</a></li>
 </ol>
-<p>The My Workspace area of Sakai is designed to give you an overview of what is happening in your courses, and provide access to your individual account information and preferences.</p>
+<p>The Home area of Sakai is designed to give you an overview of what is happening in your courses, and provide access to your individual account information and preferences.</p>
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Site-Navigation-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Site-Navigation-.html
index 1dbbe7410a43..03e0d4463ed7 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Site-Navigation-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Site-Navigation-.html
@@ -4,7 +4,7 @@
 <title>What is Site Navigation?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.myworkspace.sitenavigation" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -30,7 +30,7 @@ <h1 class="article-title">What is Site Navigation?</h1>
               <a href="/library/image/help/en/What-is-Site-Navigation-/Site-Navigation.png" rel="featherlight" target="_blank">Zoom</a>
             </div>
           </div>
-            <div class="step-instructions"><p>The Site Navigation across the top of the screen allows to you access all of the Sakai sites in which you are enrolled. &nbsp;You may also return to My Workspace at any time by clicking on the <strong>My Workspace</strong> button on the left. &nbsp;There is also <strong>Logout</strong> button in the far right hand corner to exit the system.</p></div>          </div>
+            <div class="step-instructions"><p>The Site Navigation across the top of the screen allows to you access all of the Sakai sites in which you are enrolled. &nbsp;You may also return to Home at any time by clicking on the <strong>Home</strong> button on the left. &nbsp;There is also <strong>Logout</strong> button in the far right hand corner to exit the system.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6167" class="step-container">            <h3 class="step-title">Jump to site tools.</h3>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-Site-Navigation-/Jump-to-site-tools-sm.png" width="640" height="193" class="step-image" alt="Jump to site tools."><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-Site-Navigation-/Jump-to-site-tools.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Worksite-Setup-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Worksite-Setup-.html
index 96a5adc4bc55..7f27d69fa02b 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Worksite-Setup-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-Worksite-Setup-.html
@@ -27,10 +27,10 @@ <h1 class="article-title">What is Worksite Setup?</h1>
 
             <div id="article-description">
         <p>The Worksite Setup tool provides information about the sites to which you currently belong or may join. If you have a role that allows it, you can use this tool to make changes to information about the site, tools available in the site, and access to the site. You can also publish the site using the Worksite Setup tool. </p>
-<p>Many of the functions of the Worksite Setup tool mirror those of the <a href="content.hlp?docId=whatistheSiteInfotool">Site Info</a> tool; Worksite Setup is available through My Workspace, whereas Site Info is available in each site.</p>
+<p>Many of the functions of the Worksite Setup tool mirror those of the <a href="content.hlp?docId=whatistheSiteInfotool">Site Info</a> tool; Worksite Setup is available through Home, whereas Site Info is available in each site.</p>
 <p>If you don't have the appropriate permissions, you will only see the information about the site published by the site owner in Worksite Setup.</p>
-      </div>      <div id="steps-container">          <div id="step-6100" class="step-container">            <h2 class="step-title">To access this tool, click Worksite Setup from the Tool Menu in My Workspace.</h2>                      <div class="step-image-container">
-            <img src="/library/image/help/en/What-is-Worksite-Setup-/To-access-this-tool--click-Worksite-Setup-from-the.png" width="155" height="122" class="step-image" alt="To access this tool, click Worksite Setup from the Tool Menu in My Workspace.">
+      </div>      <div id="steps-container">          <div id="step-6100" class="step-container">            <h2 class="step-title">To access this tool, click Worksite Setup from the Tool Menu in Home.</h2>                      <div class="step-image-container">
+            <img src="/library/image/help/en/What-is-Worksite-Setup-/To-access-this-tool--click-Worksite-Setup-from-the.png" width="155" height="122" class="step-image" alt="To access this tool, click Worksite Setup from the Tool Menu in Home.">
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Calendar-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Calendar-.html
index f2ee46d1371c..cb7270996aba 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Calendar-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Calendar-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What is the My Workspace Calendar?</title>
+<title>What is the Home Calendar?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.summary.calendar" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,11 +22,11 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What is the My Workspace Calendar?</h1>
+        <h1 class="article-title">What is the Home Calendar?</h1>
       </div>
 
             <div id="article-description">
-        <p>The My Workspace Calendar shows events from all of the sites in which you are enrolled. In addition, you may also create individual, private calendar entries that are only visible to you from your My Workspace.</p>
+        <p>The Home Calendar shows events from all of the sites in which you are enrolled. In addition, you may also create individual, private calendar entries that are only visible to you from your Home.</p>
       </div>      <div id="steps-container">          <div id="step-6174" class="step-container">            <h2 class="step-title">View Calendar.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-the-My-Workspace-Calendar-/View-Calendar-sm.png" width="640" height="397" class="step-image" alt="View Calendar."><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-the-My-Workspace-Calendar-/View-Calendar.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Message-of-the-Day-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Message-of-the-Day-.html
index e6b0ea5587a7..50d9f70081a9 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Message-of-the-Day-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Message-of-the-Day-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What is the My Workspace Message of the Day? </title>
+<title>What is the Home Message of the Day? </title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.myworkspace.motd" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,11 +22,11 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What is the My Workspace Message of the Day? </h1>
+        <h1 class="article-title">What is the Home Message of the Day? </h1>
       </div>
 
             <div id="article-description">
-        <p>In the Home area of&nbsp;My Workspace, you will see announcements from your system administrator under "Message of the Day" (MOTD). The MOTD is typically used for system-wide announcements. Most institutions use this space to display messages about scheduled maintenance, system updates, and important dates and events.</p>
+        <p>In the Overview area of&nbsp;Home, you will see announcements from your system administrator under "Message of the Day" (MOTD). The MOTD is typically used for system-wide announcements. Most institutions use this space to display messages about scheduled maintenance, system updates, and important dates and events.</p>
       </div>      <div id="steps-container">          <div id="step-6171" class="step-container">            <h2 class="step-title">View the MOTD.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-the-My-Workspace-Message-of-the-Day-/View-the-MOTD-sm.png" width="640" height="390" class="step-image" alt="View the MOTD."><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-the-My-Workspace-Message-of-the-Day-/View-the-MOTD.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Tool-Menu-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Tool-Menu-.html
index d7ac0f93d77f..89284ae4df36 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Tool-Menu-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Tool-Menu-.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>What is the My Workspace Tool Menu?</title>
+<title>What is the Home Tool Menu?</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="sakai.myworkspace.toolmenu" name="description">
-<meta content="My Workspace, landing page, navigation" name="search">
+<meta content="Home, landing page, navigation" name="search">
 <link href="/library/skin/tool_base.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
 <link href="/sakai-help-tool/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
@@ -22,14 +22,14 @@
   <div id="wrapper">
     <div id="article-content">
       <div id="article-header">
-        <h1 class="article-title">What is the My Workspace Tool Menu?</h1>
+        <h1 class="article-title">What is the Home Tool Menu?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-6169" class="step-container">            <h2 class="step-title">My Workspace Tool Menu.</h2>                      <div class="step-image-container">
-            <img src="/library/image/help/en/What-is-the-My-Workspace-Tool-Menu-/My-Workspace-Tool-Menu.png" width="166" height="401" class="step-image" alt="My Workspace Tool Menu.">
+            <div id="steps-container">          <div id="step-6169" class="step-container">            <h2 class="step-title">Home Tool Menu.</h2>                      <div class="step-image-container">
+            <img src="/library/image/help/en/What-is-the-My-Workspace-Tool-Menu-/My-Workspace-Tool-Menu.png" width="166" height="401" class="step-image" alt="Home Tool Menu.">
 </div>
             <div class="step-instructions">
-<p>The My Workspace Tool Menu contains links to user account information and preferences. These links include:</p>
+<p>The Home Tool Menu contains links to user account information and preferences. These links include:</p>
 <ul>
 <li>Profile</li>
 <li>Membership&nbsp;</li>
diff --git a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-Preferences-tool-.html b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-Preferences-tool-.html
index 96443216b45f..df161a28d47a 100644
--- a/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-Preferences-tool-.html
+++ b/help/help/src/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-Preferences-tool-.html
@@ -26,8 +26,8 @@ <h1 class="article-title">What is the Preferences tool?</h1>
       </div>
 
             <div id="article-description">
-        <p>In <a href="content.hlp?docId=whatisMyWorkspace">My Workspace</a>, you can set preferences for which sites appear in your navigation and which sites have their own tabs. You can also choose how often you receive email notifications of site activity, set your time zone, and select your language.</p>
-      </div>      <div id="steps-container">          <div id="step-6189" class="step-container">            <h2 class="step-title">Go to Preferences.</h2>            <div class="step-instructions"><p>Select the <strong>Preferences</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+        <p>In <a href="content.hlp?docId=whatisMyWorkspace">Home</a>, you can set preferences for which sites appear in your navigation and which sites have their own tabs. You can also choose how often you receive email notifications of site activity, set your time zone, and select your language.</p>
+      </div>      <div id="steps-container">          <div id="step-6189" class="step-container">            <h2 class="step-title">Go to Preferences.</h2>            <div class="step-instructions"><p>Select the <strong>Preferences</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6190" class="step-container">            <h2 class="step-title">Customize tabs.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/What-is-the-Preferences-tool-/Customize-tabs-sm.png" width="640" height="339" class="step-image" alt="Customize tabs."><div class="step-image-caption">
               <a href="/library/image/help/en/What-is-the-Preferences-tool-/Customize-tabs.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_permissionsandRolesInstructorGuide/What-are-Permissions-and-Roles-.html b/help/help/src/sakai_screensteps_permissionsandRolesInstructorGuide/What-are-Permissions-and-Roles-.html
index b621225d7433..8dcab625b2a7 100644
--- a/help/help/src/sakai_screensteps_permissionsandRolesInstructorGuide/What-are-Permissions-and-Roles-.html
+++ b/help/help/src/sakai_screensteps_permissionsandRolesInstructorGuide/What-are-Permissions-and-Roles-.html
@@ -37,7 +37,7 @@ <h1 class="article-title">What are Permissions and Roles?</h1>
 <li>The availability of a tool in a worksite depends on the particular implementation of the system administrator. If you have broad rights to a worksite, and find that a tool is not available through Site Info, consult your administrator. </li>
 <li>The Resources and Drop Box tools share the same permissions set. You can modify them in the Resources tool. </li>
 <li>Default roles have default permissions. These defaults can be edited on the system level by the system administrator, and on the worksite level by anyone with full permissions to the site. </li>
-<li>All users are assigned the broadest role in their respective My Workspaces to give them editing control.</li>
+<li>All users are assigned the broadest role in their respective Homes to give them editing control.</li>
 </ul>
 </div>          </div>
           <div class="clear"></div>          <div id="step-6048" class="step-container">            <h2 class="step-title">Default participant roles</h2>            <div class="step-instructions">
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-add-pictures-to-my-profile-picture-gallery-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-add-pictures-to-my-profile-picture-gallery-.html
index 357dbaace9b4..875f46b5c55b 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-add-pictures-to-my-profile-picture-gallery-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-add-pictures-to-my-profile-picture-gallery-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I add pictures to my profile picture gallery?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-6947" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+            <div id="steps-container">          <div id="step-6947" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6948" class="step-container">            <h2 class="step-title">Click Pictures.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/How-do-I-add-pictures-to-my-profile-picture-gallery-/Click-Pictures-sm.png" width="640" height="268" class="step-image" alt="Click Pictures."><div class="step-image-caption">
               <a href="/library/image/help/en/How-do-I-add-pictures-to-my-profile-picture-gallery-/Click-Pictures.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-change-my-privacy-settings-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-change-my-privacy-settings-.html
index 1af537e983c2..13a325b27545 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-change-my-privacy-settings-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-change-my-privacy-settings-.html
@@ -27,7 +27,7 @@ <h1 class="article-title">How do I change my privacy settings?</h1>
 
             <div id="article-description">
         <p>On your privacy page you can control what parts of your profile other people can see. You can tailor this so that certain information is only available to you, to your connections, or to everyone.</p>
-      </div>      <div id="steps-container">          <div id="step-6963" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6963" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6964" class="step-container">            <h2 class="step-title">Click Privacy.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-change-my-privacy-settings-/Click-Privacy.png" width="553" height="73" class="step-image" alt="Click Privacy.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-post-to-my-wall-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-post-to-my-wall-.html
index f2d105d4be24..db12d89f3ccd 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-post-to-my-wall-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-post-to-my-wall-.html
@@ -27,7 +27,7 @@ <h1 class="article-title">How do I post to my wall?</h1>
 
             <div id="article-description">
         <p>You can post to your wall in the Profile tool by entering a status message, or by posting directly to your wall. </p>
-      </div>      <div id="steps-container">          <div id="step-6942" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6942" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6943" class="step-container">            <h2 class="step-title">Enter a status message.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/How-do-I-post-to-my-wall-/Enter-a-status-message-sm.png" width="640" height="272" class="step-image" alt="Enter a status message."><div class="step-image-caption">
               <a href="/library/image/help/en/How-do-I-post-to-my-wall-/Enter-a-status-message.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-search-for-and-add-connections-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-search-for-and-add-connections-.html
index 9cce8490a754..53ce1bbd6a76 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-search-for-and-add-connections-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-search-for-and-add-connections-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I search for and add connections?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-6951" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+            <div id="steps-container">          <div id="step-6951" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6952" class="step-container">            <h2 class="step-title">Click Search.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-search-for-and-add-connections-/Click-Search.png" width="551" height="70" class="step-image" alt="Click Search.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-send-a-message-to-a-connection-in-Profile-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-send-a-message-to-a-connection-in-Profile-.html
index ea4345a4cb8e..4a24a22cae57 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-send-a-message-to-a-connection-in-Profile-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-send-a-message-to-a-connection-in-Profile-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I send a message to a connection in Profile?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-6959" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+            <div id="steps-container">          <div id="step-6959" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6960" class="step-container">            <h2 class="step-title">Click Messages.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-send-a-message-to-a-connection-in-Profile-/Click-Messages.png" width="549" height="62" class="step-image" alt="Click Messages.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-my-notification-and-other-profile-preferences-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-my-notification-and-other-profile-preferences-.html
index f35c10e1a5ee..69168605a3be 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-my-notification-and-other-profile-preferences-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-my-notification-and-other-profile-preferences-.html
@@ -28,7 +28,7 @@ <h1 class="article-title">How do I set my notification and other profile prefere
             <div id="article-description">
         <p>On your preferences page you can control what emails are sent you when various actions occur, choose what widgets are shown on your profile, manage your preference to an officially provided image (if configured) as well as manage the Twitter integration for your status updates. All changes in preferences are optional.</p>
 <p><em>Note: Depending on institutional settings, some of these options may not be available in your local instance. </em></p>
-      </div>      <div id="steps-container">          <div id="step-6967" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6967" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6968" class="step-container">            <h2 class="step-title">Click Preferences.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-set-my-notification-and-other-profile-preferences-/Click-Preferences.png" width="549" height="65" class="step-image" alt="Click Preferences.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-up-my-profile-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-up-my-profile-.html
index 13d83b008c27..2654d915c49c 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-up-my-profile-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/How-do-I-set-up-my-profile-.html
@@ -28,7 +28,7 @@ <h1 class="article-title">How do I set up my profile?</h1>
             <div id="article-description">
         <p>Your Profile is available in all of your sites throughout the system. It contains information about you, such as status messages, your photo, biography, contact information, social networking information, and privacy settings. Some institutions update fields in the Profile automatically when user accounts are created. Typical institutional updates include the user photo and email address. All Profile fields are optional.</p>
 <p><em>Note: Some Profile options may be locked or unavailable depending on institutional settings.</em></p>
-      </div>      <div id="steps-container">          <div id="step-6927" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in My Workspace.</p></div>          </div>
+      </div>      <div id="steps-container">          <div id="step-6927" class="step-container">            <h2 class="step-title">Go to Profile.</h2>            <div class="step-instructions"><p>Select the <strong>Profile</strong> tool from the Tool Menu in Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6928" class="step-container">            <h2 class="step-title">Changing Your Picture</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/How-do-I-set-up-my-profile-/Changing-Your-Picture.png" width="213" height="137" class="step-image" alt="Changing Your Picture">
 </div>
diff --git a/help/help/src/sakai_screensteps_profileInstructorGuide/What-is-the-Profile-tool-.html b/help/help/src/sakai_screensteps_profileInstructorGuide/What-is-the-Profile-tool-.html
index 78cc14a99bf4..ac8fce7cf061 100644
--- a/help/help/src/sakai_screensteps_profileInstructorGuide/What-is-the-Profile-tool-.html
+++ b/help/help/src/sakai_screensteps_profileInstructorGuide/What-is-the-Profile-tool-.html
@@ -29,8 +29,8 @@ <h1 class="article-title">What is the Profile tool?</h1>
         <p>The Profile tool contains basic user information, including names, and other optionally displayed information. &nbsp;</p>
 <p>Your Profile is available in all of your sites throughout the system. It contains information about you, such as status messages, your photo, biography, contact information, social networking information (e.g. Twitter integration), connections, notification preferences, and privacy settings. Some institutions update fields in the Profile automatically when user accounts are created. Typical institutional updates include the user photo and email address. All Profile fields are optional.</p>
 <p><em>Note: Some Profile options may be locked or unavailable depending on institutional settings.</em></p>
-      </div>      <div id="steps-container">          <div id="step-6926" class="step-container">            <h2 class="step-title">To access this tool, select Profile from the Tool Menu in My Workspace.</h2>                      <div class="step-image-container">
-            <img src="/library/image/help/en/What-is-the-Profile-tool-/To-access-this-tool--select-Profile-from-the-Tool-.png" width="154" height="118" class="step-image" alt="To access this tool, select Profile from the Tool Menu in My Workspace.">
+      </div>      <div id="steps-container">          <div id="step-6926" class="step-container">            <h2 class="step-title">To access this tool, select Profile from the Tool Menu in Home.</h2>                      <div class="step-image-container">
+            <img src="/library/image/help/en/What-is-the-Profile-tool-/To-access-this-tool--select-Profile-from-the-Tool-.png" width="154" height="118" class="step-image" alt="To access this tool, select Profile from the Tool Menu in Home.">
 </div>          </div>
           <div class="clear"></div>      </div>      
     </div>
diff --git a/help/help/src/sakai_screensteps_resourcesAdministratorGuide/What-Resources-are-specific-to-admin-users-.html b/help/help/src/sakai_screensteps_resourcesAdministratorGuide/What-Resources-are-specific-to-admin-users-.html
index d774b90943ac..9de46afee49c 100644
--- a/help/help/src/sakai_screensteps_resourcesAdministratorGuide/What-Resources-are-specific-to-admin-users-.html
+++ b/help/help/src/sakai_screensteps_resourcesAdministratorGuide/What-Resources-are-specific-to-admin-users-.html
@@ -41,7 +41,7 @@ <h1 class="article-title">What Resources are specific to admin users?</h1>
 <li>The <strong>group-user</strong> directory contains all of the folders and files associate with the Drop Box tool in individual sites. </li>
 <li>The <strong>private</strong> directory contains files uploaded to the Profile tool (i.e. users' Photo Gallery or Profile Images).</li>
 <li>The <strong>public</strong> directory contains files which can be viewed by all users in the system. Admin users should place files in this location if they wish to share them with all users in the system - for example, images to be used in Message of the Day notifications. </li>
-<li>The <strong>user</strong> directory contains files uploaded to individual users' My Workspace sites.</li>
+<li>The <strong>user</strong> directory contains files uploaded to individual users' Home sites.</li>
 </ol>
 </div>          </div>
           <div class="clear"></div>      </div>      
diff --git a/help/help/src/sakai_screensteps_resourcesInstructorGuide/What-is-the-Resources-tool-.html b/help/help/src/sakai_screensteps_resourcesInstructorGuide/What-is-the-Resources-tool-.html
index cfce40aa7ec8..db44dd20e1e5 100644
--- a/help/help/src/sakai_screensteps_resourcesInstructorGuide/What-is-the-Resources-tool-.html
+++ b/help/help/src/sakai_screensteps_resourcesInstructorGuide/What-is-the-Resources-tool-.html
@@ -26,7 +26,7 @@ <h1 class="article-title">What is the Resources tool?</h1>
       </div>
 
             <div id="article-description">
-        <p>The Resources tool allows instructors to share a wide variety of files with their students within a site. Individual users may also have Resources within their personal My Workspace area. </p>
+        <p>The Resources tool allows instructors to share a wide variety of files with their students within a site. Individual users may also have Resources within their personal Home area. </p>
 <p>Instructors or site owners can upload files (for instance, word processing documents, spreadsheets, slide presentations, audio and videos), as well as create and post HTML (web) pages, simple text documents, library citations, and share links to useful web sites.</p>
 <p>Instructors or site owners can organize these files and links into folders and subfolders making it easier for students to locate and access items. Folders and files in Resources can be moved or reordered within a site or copied from one site to another.</p>
 <p>Files and folders can display contextual remarks, can be shown, hidden or viewable only during specific dates and times. Instructors can automatically notify site members by email that an item has been added to Resources.</p>
diff --git a/help/help/src/sakai_screensteps_scheduleInstructorGuide/How-do-I-merge-the-Schedule-Calendar-with-another-site-.html b/help/help/src/sakai_screensteps_scheduleInstructorGuide/How-do-I-merge-the-Schedule-Calendar-with-another-site-.html
index dfce14016705..130a6b3f5e96 100644
--- a/help/help/src/sakai_screensteps_scheduleInstructorGuide/How-do-I-merge-the-Schedule-Calendar-with-another-site-.html
+++ b/help/help/src/sakai_screensteps_scheduleInstructorGuide/How-do-I-merge-the-Schedule-Calendar-with-another-site-.html
@@ -27,7 +27,7 @@ <h1 class="article-title">How do I merge the Schedule/Calendar with another site
 
             <div id="article-description">
         <p>If you would like to combine calendar items from two or more sites, you may choose to merge the calendars. </p>
-<p>Remember that all calendar entries for sites you have access to are automatically merged in your My Workspace Schedule.</p>
+<p>Remember that all calendar entries for sites you have access to are automatically merged in your Home Schedule.</p>
 <p><em>Note: You must have appropriate level permissions (i.e. calendar owner) to merge calendars. Merged calendar items will only be visible for site participants who are active in both sites.</em></p>
       </div>      <div id="steps-container">          <div id="step-7331" class="step-container">            <h2 class="step-title">Go to Schedule.</h2>            <div class="step-instructions"><p>Select the <strong>Schedule</strong> tool from the Tool Menu of your site. (Remember that it may also be called the Calendar tool).</p></div>          </div>
           <div class="clear"></div>          <div id="step-7332" class="step-container">            <h2 class="step-title">Click Merge.</h2>                      <div class="step-image-container">
diff --git a/help/help/src/sakai_screensteps_scheduleInstructorGuide/What-is-the-Schedule-Calendar-tool-.html b/help/help/src/sakai_screensteps_scheduleInstructorGuide/What-is-the-Schedule-Calendar-tool-.html
index 8180c24e10e2..965090b6b7a3 100644
--- a/help/help/src/sakai_screensteps_scheduleInstructorGuide/What-is-the-Schedule-Calendar-tool-.html
+++ b/help/help/src/sakai_screensteps_scheduleInstructorGuide/What-is-the-Schedule-Calendar-tool-.html
@@ -29,7 +29,7 @@ <h1 class="article-title">What is the Schedule/Calendar tool?</h1>
         <p>The Schedule tool allows instructors or site organizers to post events in a calendar format. The calendar has day, week, month, year, and simple list views.</p>
 <p>The Schedule can be used to post important dates in a class, such as start and end dates, assessment dates, etc.</p>
 <p>Project sites may use Schedule to post key dates, such as deadlines.</p>
-<p>All calendars from all sites you have access to are merged in your My Workspace Schedule. </p>
+<p>All calendars from all sites you have access to are merged in your Home Schedule. </p>
 <p><em>Note: In some cases, local instances of Sakai have renamed the Schedule tool as Calendar on a system-wide basis; therefore, you may see it called the Calendar tool rather than Schedule tool.</em> </p>
       </div>      <div id="steps-container">          <div id="step-7292" class="step-container">            <h2 class="step-title">To access this tool, select Schedule from the Tool Menu of your site.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/What-is-the-Schedule-Calendar-tool-/To-access-this-tool--select-Schedule-from-the-Tool.png" width="157" height="123" class="step-image" alt="To access this tool, select Schedule from the Tool Menu of your site.">
diff --git a/help/help/src/sakai_screensteps_sectionInfoInstructorGuide/How-are-sections-different-than-groups-.html b/help/help/src/sakai_screensteps_sectionInfoInstructorGuide/How-are-sections-different-than-groups-.html
index b5b34ac8d80f..a26d2819ac7b 100644
--- a/help/help/src/sakai_screensteps_sectionInfoInstructorGuide/How-are-sections-different-than-groups-.html
+++ b/help/help/src/sakai_screensteps_sectionInfoInstructorGuide/How-are-sections-different-than-groups-.html
@@ -42,7 +42,7 @@ <h1 class="article-title">How are sections different than groups?</h1>
           <div class="clear"></div>          <div id="step-7364" class="step-container">            <h2 class="step-title">Groups</h2>            <div class="step-instructions">
 <p>Groups are also subsets of participants for a given site. However, groups are not preloaded with official course data, and are created by the instructor or site owner instead. Groups are useful to organize study groups, project teams, and other, non-official subsets of worksite participants.</p>
 <ul>
-<li>Groups are managed through the Site Info tool. They are also accessible through Worksite Setup in My Workspace. </li>
+<li>Groups are managed through the Site Info tool. They are also accessible through Worksite Setup in Home. </li>
 <li>Groups may have a title. </li>
 <li>Groups are not populated with official course data. </li>
 <li>Groups do not have an assigned teaching assistant.</li>
diff --git a/help/help/src/sakai_screensteps_siteInfoInstructorGuide/What-is-the-Site-Info-tool-.html b/help/help/src/sakai_screensteps_siteInfoInstructorGuide/What-is-the-Site-Info-tool-.html
index 50e31a12af88..17bd97a19f81 100644
--- a/help/help/src/sakai_screensteps_siteInfoInstructorGuide/What-is-the-Site-Info-tool-.html
+++ b/help/help/src/sakai_screensteps_siteInfoInstructorGuide/What-is-the-Site-Info-tool-.html
@@ -28,7 +28,7 @@ <h1 class="article-title">What is the Site Info tool?</h1>
             <div id="article-description">
         <p>Site Info tool contains many of the course management features needed for instructors to customize and manage their courses. Instructors may edit and rearrange the tools on their course toolbar, add participants, manage groups, publish or unpublish their course, import content from another site, and track participant enrollment activity.</p>
 <p>If you have limited site permissions (i.e. participant), you'll see only the site's description and your group memberships, if applicable, in Site Info.</p>
-<p><em>Note: The functions of the Site Info tool are also available through the </em><em><a href="content.hlp?docId=whatisWorksiteSetup">Worksite Setup</a></em><em> tool, which is available from the Tool Menu when you are in My Workspace. </em></p>
+<p><em>Note: The functions of the Site Info tool are also available through the </em><em><a href="content.hlp?docId=whatisWorksiteSetup">Worksite Setup</a></em><em> tool, which is available from the Tool Menu when you are in Home. </em></p>
       </div>      <div id="steps-container">          <div id="step-7454" class="step-container">            <h2 class="step-title">To access this tool, select Site Info from the Tool Menu of your site.</h2>                      <div class="step-image-container">
             <img src="/library/image/help/en/What-is-the-Site-Info-tool-/To-access-this-tool--select-Site-Info-from-the-Too.png" width="158" height="121" class="step-image" alt="To access this tool, select Site Info from the Tool Menu of your site.">
 </div>          </div>
diff --git a/help/help/src/sakai_screensteps_worksiteSetupAdministratorGuide/How-do-I-Hard-Delete-a-site-.html b/help/help/src/sakai_screensteps_worksiteSetupAdministratorGuide/How-do-I-Hard-Delete-a-site-.html
index c2631bb472b3..75267471e0e3 100644
--- a/help/help/src/sakai_screensteps_worksiteSetupAdministratorGuide/How-do-I-Hard-Delete-a-site-.html
+++ b/help/help/src/sakai_screensteps_worksiteSetupAdministratorGuide/How-do-I-Hard-Delete-a-site-.html
@@ -25,7 +25,7 @@
         <h1 class="article-title">How do I Hard Delete a site?</h1>
       </div>
 
-            <div id="steps-container">          <div id="step-6105" class="step-container">            <h2 class="step-title">Go to Worksite Setup.</h2>            <div class="step-instructions"><p>Select the<strong> Worksite Setup</strong> tool from the Tool Menu in the Administration Workspace or My Workspace.</p></div>          </div>
+            <div id="steps-container">          <div id="step-6105" class="step-container">            <h2 class="step-title">Go to Worksite Setup.</h2>            <div class="step-instructions"><p>Select the<strong> Worksite Setup</strong> tool from the Tool Menu in the Administration Workspace or Home.</p></div>          </div>
           <div class="clear"></div>          <div id="step-6106" class="step-container">            <h2 class="step-title">Check the box next to the site or sites you want to permanently delete.</h2>                      <div class="step-image-container step-image-fullsize">
             <img src="/library/image/help/en/How-do-I-Hard-Delete-a-site-/Check-the-box-next-to-the-site-or-sites-you-want-t-sm.png" width="640" height="341" class="step-image" alt="Check the box next to the site or sites you want to permanently delete."><div class="step-image-caption">
               <a href="/library/image/help/en/How-do-I-Hard-Delete-a-site-/Check-the-box-next-to-the-site-or-sites-you-want-t.png" rel="featherlight" target="_blank">Zoom</a>
diff --git a/help/help/src/sakai_toc/help.xml b/help/help/src/sakai_toc/help.xml
index 316a3d4645fd..1f8fc691f7e6 100644
--- a/help/help/src/sakai_toc/help.xml
+++ b/help/help/src/sakai_toc/help.xml
@@ -120,7 +120,7 @@
   </bean>
   <bean id="myWorkspaceInstructorGuide" class="org.sakaiproject.component.app.help.model.CategoryBean">
     <property name="name">
-      <value>My Workspace</value>
+      <value>Home</value>
     </property>
     <property name="resources">
       <list>
@@ -144,7 +144,7 @@
       <value>whatisMyWorkspace</value>
     </property>
     <property name="name">
-      <value>What is My Workspace?</value>
+      <value>What is Home?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-is-My-Workspace-.html</value>
@@ -169,7 +169,7 @@
       <value>whatistheMyWorkspaceToolMenu</value>
     </property>
     <property name="name">
-      <value>What is the My Workspace Tool Menu?</value>
+      <value>What is the Home Tool Menu?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Tool-Menu-.html</value>
@@ -180,7 +180,7 @@
       <value>whatistheMyWorkspaceMessageoftheDay</value>
     </property>
     <property name="name">
-      <value>What is the My Workspace Message of the Day? </value>
+      <value>What is the Home Message of the Day? </value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Message-of-the-Day-.html</value>
@@ -194,7 +194,7 @@
       <value>whatistheMyWorkspaceCalendar</value>
     </property>
     <property name="name">
-      <value>What is the My Workspace Calendar?</value>
+      <value>What is the Home Calendar?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-is-the-My-Workspace-Calendar-.html</value>
@@ -208,7 +208,7 @@
       <value>whataretheMyWorkspaceRecentAnnouncements</value>
     </property>
     <property name="name">
-      <value>What are the My Workspace Recent Announcements?</value>
+      <value>What are the Home Recent Announcements?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Recent-Announcements-.html</value>
@@ -222,7 +222,7 @@
       <value>whataretheMyWorkspaceMessageCenterNotifications</value>
     </property>
     <property name="name">
-      <value>What are the My Workspace Message Center Notifications?</value>
+      <value>What are the Home Message Center Notifications?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-My-Workspace-Message-Center-Notifications-.html</value>
@@ -280,7 +280,7 @@
       <value>whataretheResourcesinMyWorkspace</value>
     </property>
     <property name="name">
-      <value>What are the Resources in My Workspace?</value>
+      <value>What are the Resources in Home?</value>
     </property>
     <property name="location">
       <value>/sakai_screensteps_myWorkspaceInstructorGuide/What-are-the-Resources-in-My-Workspace-.html</value>
@@ -4138,7 +4138,7 @@
   </bean>
   <bean id="myWorkspaceStudentGuide" class="org.sakaiproject.component.app.help.model.CategoryBean">
     <property name="name">
-      <value>My Workspace</value>
+      <value>Home</value>
     </property>
     <property name="resources">
       <list>
diff --git a/login/login-authn-tool/tool/src/bundle/sitenav.properties b/login/login-authn-tool/tool/src/bundle/sitenav.properties
index 1059dea58bfc..304a44a46e5e 100644
--- a/login/login-authn-tool/tool/src/bundle/sitenav.properties
+++ b/login/login-authn-tool/tool/src/bundle/sitenav.properties
@@ -10,7 +10,7 @@ log.userid = user id:
 sit.log   = Logout
 sit.more  = - more -
 sit.selectmessage  = To operate the combo box, first press Alt+Down Arrow to open it, and then use the up and down arrow keys to scroll through the options.
-sit.mywor = My Workspace
+sit.mywor = Home
 sit.worksite = worksite
 sit.worksites = Worksites
 sit.accessibility = go to accessibility information page
diff --git a/login/login-authn-tool/tool/src/bundle/sitenav_en_GB.properties b/login/login-authn-tool/tool/src/bundle/sitenav_en_GB.properties
index 1059dea58bfc..304a44a46e5e 100644
--- a/login/login-authn-tool/tool/src/bundle/sitenav_en_GB.properties
+++ b/login/login-authn-tool/tool/src/bundle/sitenav_en_GB.properties
@@ -10,7 +10,7 @@ log.userid = user id:
 sit.log   = Logout
 sit.more  = - more -
 sit.selectmessage  = To operate the combo box, first press Alt+Down Arrow to open it, and then use the up and down arrow keys to scroll through the options.
-sit.mywor = My Workspace
+sit.mywor = Home
 sit.worksite = worksite
 sit.worksites = Worksites
 sit.accessibility = go to accessibility information page
diff --git a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc.properties b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc.properties
index 366ebd876715..8ddfd1509979 100644
--- a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc.properties
+++ b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc.properties
@@ -13,5 +13,5 @@ Date = Date
 Message = Message
 
 automsg1 = This automatic notification message was sent by {0} ({1}) from the {2} site.
-automsg2 = You can modify how you receive notifications at My Workspace > Preferences.
+automsg2 = You can modify how you receive notifications at Home > Preferences.
 
diff --git a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_mn.properties b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_mn.properties
index 7271e2f9d239..7481fcd0af01 100644
--- a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_mn.properties
+++ b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_mn.properties
@@ -18,5 +18,5 @@ Date = \u041E\u0433\u043D\u043E\u043E
 Message = \u041C\u0435\u0441\u0441\u0435\u0436
 
 automsg1 = \u042D\u043D\u044D\u0445\u04AF\u04AF \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 {2} \u0441\u0430\u0439\u0442\u0430\u0430\u0441 {0} ({1}) \u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430.
-automsg2 = My Workspace > Preferences-\u0434 \u0442\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 \u04E9\u04E9\u0440\u0447\u0438\u043B\u0436 \u0431\u043E\u043B\u043D\u043E.
+automsg2 = Home > Preferences-\u0434 \u0442\u0430 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u0433 \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 \u04E9\u04E9\u0440\u0447\u0438\u043B\u0436 \u0431\u043E\u043B\u043D\u043E.
 
diff --git a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_sv.properties b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_sv.properties
index 19fc44bc9e33..00f73f84baf9 100644
--- a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_sv.properties
+++ b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_sv.properties
@@ -24,7 +24,7 @@ Message=Meddelande
 Subject=\u00C4mne
 added=tillagts
 automsg1=Denna automatiska notifiering skickades av {0} ({1}) fr\u00E5n sajten {2}.
-automsg2=Du kan modifiera hur du tar emot notifieringar under My Workspace (Min arbetsyta) > Preferences (Inst\u00E4llningar).
+automsg2=Du kan modifiera hur du tar emot notifieringar under Home (Min arbetsyta) > Preferences (Inst\u00E4llningar).
 forthe=fr\u00E5n
 in_the=p\u00E5
 separator=----------------------
diff --git a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_vi.properties b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_vi.properties
index d9a532ebac74..a96736642290 100644
--- a/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_vi.properties
+++ b/mailarchive/mailarchive-impl/impl/src/bundle/siteemaanc_vi.properties
@@ -9,7 +9,7 @@ Date=Ng\u00E0y
 updated=c\u1EADp nh\u1EADt 
 added=th\u00EAm 
 site_at=trang web t\u1EA1i 
-automsg2=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. 
+automsg2=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences. 
 automsg1=Th\u00F4ng b\u00E1o t\u1EF1 \u0111\u1ED9ng s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EB1ng {0} ({1}) t\u1EEB c\u00E1c trang web () 2. 
 Message=Th\u00F4ng b\u00E1o 
 Subject=Ch\u1EE7 \u0111\u1EC1 
diff --git a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
index 37701d6bbc2f..655a8c2ef42e 100644
--- a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
+++ b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
@@ -711,7 +711,7 @@ longPageLoad=synMain
 longPageLoadLite=synMainLite
 viewSynopticInfo=Show me my new messages and forum postings
 wait_icon=images/wait_sakai.gif
-synopticToolDisabled=The Check for new messages link has been temporarily disabled in My Workspace. Messages and Forums Notifications are still available on the Home page of any site.
+synopticToolDisabled=The Check for new messages link has been temporarily disabled in Home. Messages and Forums Notifications are still available on the Home page of any site.
 
 print_url=javascript:window.print()
 
diff --git a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_en_GB.properties b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_en_GB.properties
index 8bb87419f38d..72b46a09b7b4 100644
--- a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_en_GB.properties
+++ b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_en_GB.properties
@@ -669,7 +669,7 @@ longPageLoad=synMain
 longPageLoadLite=synMainLite
 viewSynopticInfo=Show me my new messages and forum postings
 wait_icon=images/wait_sakai.gif
-synopticToolDisabled=The Check for new messages link has been temporarily disabled in My Workspace. Messages and Forums Notifications are still available on the Home page of any site.
+synopticToolDisabled=The Check for new messages link has been temporarily disabled in Home. Messages and Forums Notifications are still available on the Home page of any site.
 
 print_url=javascript:window.print()
 
diff --git a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_pl_PL.properties b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_pl_PL.properties
index 6aa2085076e6..03489b5dba5b 100644
--- a/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_pl_PL.properties
+++ b/msgcntr/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_pl_PL.properties
@@ -675,7 +675,7 @@ longPageLoad=synMain
 longPageLoadLite=synMainLite
 viewSynopticInfo=Show me my new messages and forum postings
 wait_icon=images/wait_sakai.gif
-synopticToolDisabled=The Check for new messages link has been temporarily disabled in My Workspace. Messages and Forums Notifications are still available on the Home page of any site.
+synopticToolDisabled=The Check for new messages link has been temporarily disabled in Home. Messages and Forums Notifications are still available on the Home page of any site.
 
 print_url=javascript:window.print()
 
diff --git a/portal/portal-impl/impl/src/bundle/sitenav.properties b/portal/portal-impl/impl/src/bundle/sitenav.properties
index 5bc88e636c9c..ce701eb6bdac 100644
--- a/portal/portal-impl/impl/src/bundle/sitenav.properties
+++ b/portal/portal-impl/impl/src/bundle/sitenav.properties
@@ -18,9 +18,9 @@ sit_logout_warn = Are you sure you want to log out?
 sit_more  = All Sites
 sit_more_tab = My Active Sites
 sit_notermkey = Courses: No Term
-sit_moretab_inst = <em>Hidden Sites</em> are not included in this menu. Access them in My Workspace -&gt; Worksite Setup.<br /> To hide a site, go to My Workspace -> Preferences -> Customize Tabs.
+sit_moretab_inst = <em>Hidden Sites</em> are not included in this menu. Access them in Home -&gt; Worksite Setup.<br /> To hide a site, go to Home -> Preferences -> Customize Tabs.
 sit_selectmessage  = To operate the combo box, first press Alt+Down Arrow to open it, and then use the up and down arrow keys to scroll through the options.
-sit_mywor = My Workspace
+sit_mywor = Home
 sit_worksite = site
 sit_worksites = Sites
 sit_accessibility = go to accessibility information page
@@ -103,7 +103,7 @@ join_restricted = This site has limited access. You cannot join the site with yo
 
 yes = Yes
 no = No
-return = Return to My Workspace
+return = Return to Home
 
 pc_title = Chat
 pc_chat_close = Close this chat
diff --git a/portal/portal-impl/impl/src/bundle/sitenav_en_GB.properties b/portal/portal-impl/impl/src/bundle/sitenav_en_GB.properties
index bce7806bf386..1828d6355df3 100644
--- a/portal/portal-impl/impl/src/bundle/sitenav_en_GB.properties
+++ b/portal/portal-impl/impl/src/bundle/sitenav_en_GB.properties
@@ -14,9 +14,9 @@ sit_log   = Logout
 sit_more  = More Sites
 sit_more_tab = My Active Sites
 sit_notermkey = Courses: No Term
-sit_moretab_inst = <em>Hidden Sites</em> are not included in this menu. Access them in My Workspace -&gt; Worksite Setup.<br /> To hide a site, go to My Workspace -> Preferences -> Customise Tabs.
+sit_moretab_inst = <em>Hidden Sites</em> are not included in this menu. Access them in Home -&gt; Worksite Setup.<br /> To hide a site, go to Home -> Preferences -> Customise Tabs.
 sit_selectmessage  = To operate the combo box, first press Alt+Down Arrow to open it, and then use the up and down arrow keys to scroll through the options.
-sit_mywor = My Workspace
+sit_mywor = Home
 sit_worksite = site
 sit_worksites = Sites
 sit_accessibility = go to accessibility information page
diff --git a/portal/portal-impl/impl/src/bundle/sitenav_sv.properties b/portal/portal-impl/impl/src/bundle/sitenav_sv.properties
index 6254aea70038..de6021514665 100644
--- a/portal/portal-impl/impl/src/bundle/sitenav_sv.properties
+++ b/portal/portal-impl/impl/src/bundle/sitenav_sv.properties
@@ -60,7 +60,7 @@ sit_jumpworksite=Hoppa till listan med sajter
 sit_log=Logga ut
 sit_more=\ - mer -
 sit_more_tab=Mina aktiva sajter
-sit_moretab_inst=<em>Dolda sajter</em> u00E4r inte inkluderade i denna meny. De finns tillgu00E4ngliga i 'My Workspace/Min Arbetsyta'  -&gt; 'Worksite setup/Skapa eller \u00e4ndra sajter'. <br /> F\u00f6r att visa eller d\u00f6lja en sajt, g\u00e5 till 'My Workspace/Min arbetsyta' -> Preferences/Inst\u00e4llningar -> 'Customize Tabs/V\u00e4lj vilka sajter som skall visas som flikar'.
+sit_moretab_inst=<em>Dolda sajter</em> u00E4r inte inkluderade i denna meny. De finns tillgu00E4ngliga i 'Home/Min Arbetsyta'  -&gt; 'Worksite setup/Skapa eller \u00e4ndra sajter'. <br /> F\u00f6r att visa eller d\u00f6lja en sajt, g\u00e5 till 'Home/Min arbetsyta' -> Preferences/Inst\u00e4llningar -> 'Customize Tabs/V\u00e4lj vilka sajter som skall visas som flikar'.
 sit_mywor=Min arbetsyta
 sit_notermkey=Kurser\: Ingen termin
 sit_presenceiframetit=Inloggade deltagare p\u00E5 sajten
@@ -87,4 +87,4 @@ pda_switch=               Byt till full vy
 pda_present=           Anv\u00e4ndar-n\u00e4rvaro
 pda_logout=        Logga ut
 pda_sites=                        Sajter
-subsite=             Undersajt:
\ No newline at end of file
+subsite=             Undersajt:
diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
index 7f6da3ea4fc8..53a9df7f288a 100644
--- a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
+++ b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1182,7 +1182,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse res)
 	 * processing and return null to the caller.
 	 *
 	 * If the reference is to the magical, indexical MyWorkspace site ('~')
-	 * then replace ~ by their My Workspace.  Give them a chance to login
+	 * then replace ~ by their Home.  Give them a chance to login
 	 * if necessary.
 	 */
 
diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm
index f20b19841b9c..75511a76be4d 100644
--- a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm
+++ b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm
@@ -10,7 +10,7 @@
                     <li class="Mrphs-sitesNav__menuitem Mrphs-sitesNav__menuitem--myworkspace #if (${site.isCurrentSite}) is-selected #end">
                         <a href="${site.siteUrl}" title="${rloader.sit_mywor}" role="menuitem" aria-haspopup="true">
                             <i class="fa fa-home"></i>
-                            <span>${rloader.sit_mywor}</span>
+                            <span class="Mrphs-sitesNav__menuitem--myworkspace-label">${rloader.sit_mywor}</span>
                             <span class="Mrphs-sitesNav__drop" tabindex="-1" data-site-id="${site.siteId}"></span>
                         </a>
                     </li>           
diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm
index dc86cbf07de2..a8c7add8cecc 100644
--- a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm
+++ b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm
@@ -56,10 +56,9 @@
 							
                             <div class="fav-title #if (${site.isMyWorkspace}) fav-title-myworkspace #end">
                             	<a href="${site.siteUrl}" title="${site.siteTitleNotTruncated}">
-                            		#if (${site.isMyWorkspace})  
-	                                    <i class="fa fa-home icon-sakai"></i>
-                            		#end
-                                    #if ( ( ${tabDisplayLabel} == 2 ) && ( ${site.shortDescription} ) )
+                                    #if (${site.isMyWorkspace})
+                                        <i class="fa fa-home icon-sakai"></i><span class="fullTitle">${rloader.sit_mywor}</span>
+                                    #elseif ( ( ${tabDisplayLabel} == 2 ) && ( ${site.shortDescription} ) )
                                         <span class="fullTitle">${site.shortDescription}</span>
                                     #else
                                         <span class="fullTitle">${site.siteTitle}</span>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionConfirm.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionConfirm.xml
index 085de551dd82..7cd869d91629 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionConfirm.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionConfirm.xml
@@ -8,7 +8,7 @@ ${connectionLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} confirmed your connection request on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To view ${senderDisplayName}&apos;s profile, follow the url below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.connectionConfirm</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionRequest.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionRequest.xml
index f77b137fe4c7..ee5bfc1bb482 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionRequest.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-connectionRequest.xml
@@ -8,7 +8,7 @@ ${connectionLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} added you as a connection on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To confirm ${senderDisplayName}&apos;s connection request, follow the url below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.connectionRequest</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageNew.xml
index d23ec2d5478e..2b5ff5ffd18a 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageNew.xml
@@ -14,7 +14,7 @@ ${messageLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} sent you a message on ${localSakaiName}
 &lt;p&gt;
@@ -32,10 +32,10 @@ Control what email notifications you receive from connections at My Workspace >
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>3</version>
 	<owner>admin</owner>
 	<key>profile2.messageNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageReply.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageReply.xml
index 4b30c9a4b734..418ba4dbdc8a 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageReply.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-messageReply.xml
@@ -14,7 +14,7 @@ ${messageLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} replied to your message on ${localSakaiName}
 &lt;p&gt;
@@ -32,10 +32,10 @@ Control what email notifications you receive from connections at My Workspace >
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>3</version>
 	<owner>admin</owner>
 	<key>profile2.messageReply</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallEventNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallEventNew.xml
index d0ebea2cba8d..3a764f63a005 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallEventNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallEventNew.xml
@@ -8,7 +8,7 @@ ${senderWallLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} added activity to their profile wall on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To view their wall, follow the link below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.wallEventNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostConnectionWallNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostConnectionWallNew.xml
index 9afd5a319fbc..73ae0ac5264b 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostConnectionWallNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostConnectionWallNew.xml
@@ -8,7 +8,7 @@ ${senderWallLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} has just posted to their profile wall on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To view ${senderDisplayName}'s wall, follow the link below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.wallPostConnectionWallNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostMyWallNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostMyWallNew.xml
index bff510cff58c..3b7202bc2e8c 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostMyWallNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallPostMyWallNew.xml
@@ -8,7 +8,7 @@ ${wallLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} has just posted to your profile wall on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To view your wall, follow the link below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.wallPostMyWallNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallStatusNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallStatusNew.xml
index d5f90e603259..15c3c9c5762e 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallStatusNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-wallStatusNew.xml
@@ -8,7 +8,7 @@ ${senderWallLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName}'s new status was posted on their profile wall on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To view their wall, follow the link below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.wallStatusNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-worksiteNew.xml b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-worksiteNew.xml
index 671cb2a629d7..c6b3df439b45 100644
--- a/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-worksiteNew.xml
+++ b/profile2/api/src/java/org/sakaiproject/profile2/emailtemplates/template-worksiteNew.xml
@@ -8,7 +8,7 @@ ${worksiteLink}
 
 ---
 This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-Control what email notifications you receive from connections at My Workspace > ${toolName} > Preferences
+Control what email notifications you receive from connections at Home > ${toolName} > Preferences
 	</message>
 	<htmlMessage>${senderDisplayName} has created the new '${worksiteTitle}' worksite for you to collaborate on ${localSakaiName}
 &lt;p&gt;
@@ -18,10 +18,10 @@ To access the worksite, follow the link below:
 &lt;p&gt;
 ---
 &lt;br /&gt;This automatic notification message was sent by ${localSakaiName} (${localSakaiUrl})
-&lt;br /&gt;Control what email notifications you receive from connections at My Workspace &gt; ${toolName} &gt; Preferences
+&lt;br /&gt;Control what email notifications you receive from connections at Home &gt; ${toolName} &gt; Preferences
 &lt;/p&gt;
 	</htmlMessage>
 	<version>2</version>
 	<owner>admin</owner>
 	<key>profile2.worksiteNew</key>
-</emailTemplate>
\ No newline at end of file
+</emailTemplate>
diff --git a/reference/library/src/morpheus-master/sass/base/_icons.scss b/reference/library/src/morpheus-master/sass/base/_icons.scss
index 7d4767765cf4..7a497965f1d6 100644
--- a/reference/library/src/morpheus-master/sass/base/_icons.scss
+++ b/reference/library/src/morpheus-master/sass/base/_icons.scss
@@ -14,8 +14,15 @@
 		@extend .fa;
 	}
 
-	.icon-sakai-iframe-site{ 				@extend .fa-university;}
-	.icon-sakai-motd{ 					@extend .fa-university;}
+	.icon-sakai-iframe-site{ 				@extend .fa-list-ul;}
+	.icon-sakai-motd{ 					@extend .fa-list-ul;}
+
+	/* when we're showing the motd tool as "Welcome" on the gateway page,
+	   use a different icon. */
+	a.Mrphs-hierarchy-item.Mrphs-hierarchy--toolName[href*="!gateway"] .icon-sakai-motd, a.Mrphs-toolsNav__menuitem--link[href*="!gateway"] .icon-sakai-motd{
+		@extend .fa-sign-in;
+	}
+
 	.icon-sakai-syllabus{					@extend .fa-map-o;}
 	.icon-sakai-schedule{					@extend .fa-calendar;}
 	.icon-sakai-signup{					@extend .fa-calendar-check-o ;}
diff --git a/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss b/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss
index 0283a69b005c..4de7bdb5615b 100644
--- a/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss
+++ b/reference/library/src/morpheus-master/sass/modules/navigation/_base.scss
@@ -441,51 +441,6 @@ body.is-logged-out{
 	padding: 0 0 0 0;
 	margin-bottom:0px;
 }
-.#{$namespace}sitesNav__menuitem--myworkspace{
-	font-size: 0.95em;
-	@media #{$phone}{
-		background: $primary-color;
-		border-right: 1px solid darken( $primary-color, 5% );
-	 	height:3.1em;
-		position: fixed;
-		top: 0;
-		z-index: 1000;
-		@include transition( top 0.25s linear 0s );
-		&.moving{
-			top: -4.5em;
-		}
-	}
-	span{
-		display: none;
-	}
-	.#{namespace}sitesNav__drop{
-		display: none;
-	}
-	&.is-selected{
-		@media #{$phone}{
-			background: $primary-color;
-		}
-		a{
-			color: $primary-color;
-		}
-	}
-	a{
-		display: inline-block;
-		border-right: 0px none;
-		color: $background-color;
-		@media #{$phone}{
-			color: $background-color-secondary;
-		}
-		padding: 0.6em 0.8em;
-		i{
-			font-size: 1.7em;
-		}
-		&:hover{
-			/*color: $background-color-secondary;*/
-			box-shadow: inset 0 9px 10px rgba(0,0,0,0.25);
-		}
-	}
-}
 
 .view-all-sites-btn{
 	position: relative;
@@ -610,27 +565,22 @@ body.is-logged-out{
 					background: $primary-color;
 				}
 			}
+
 			&.#{$namespace}sitesNav__menuitem--myworkspace{
-				font-size: 0.95em;
-				margin: 0 0 0 0;
-				span{
-					display: none;
-				}
-				.#{namespace}sitesNav__drop{
+				.#{$namespace}sitesNav__drop{
 					display: none;
 				}
-				&.is-selected{
+
+				&:not(.is-selected){
 					a{
-						color: $primary-color;
+						background-color: transparent;
+						color: $background-color;
 					}
 				}
+
 				a{
-					background: transparent;
-					border-right: 0px none;
-					color: $background-color;
-					top: 0;
 					i{
-						font-size: 1.7em;
+						font-size: 1.3em;
 					}
 				}
 			}
diff --git a/reference/library/src/webapp/content/myworkspace_info.html b/reference/library/src/webapp/content/myworkspace_info.html
index be6323c0e6ec..ea12b6f1bc44 100644
--- a/reference/library/src/webapp/content/myworkspace_info.html
+++ b/reference/library/src/webapp/content/myworkspace_info.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-		<title>My Workspace Information</title>
+		<title>Home Information</title>
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
 			var i, a, href
@@ -37,7 +37,7 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Welcome to your personal workspace.</h3>
-			<p>In Sakai each user has his or her own individual worksite called My Workspace. My
+			<p>In Sakai each user has his or her own individual worksite called Home. My
 			Workspace is a place where you can keep personal documents, create new sites, maintain a
 			schedule, store resources, and much more.</p>
 			<p class="instruction">The default information displayed here for a new user can be modified by the Sakai
diff --git a/reference/library/src/webapp/content/myworkspace_info_mn.html b/reference/library/src/webapp/content/myworkspace_info_mn.html
index 49ba17ebf121..af8b15228be2 100755
--- a/reference/library/src/webapp/content/myworkspace_info_mn.html
+++ b/reference/library/src/webapp/content/myworkspace_info_mn.html
@@ -37,7 +37,7 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Хувийн ажлын хэсэгтээ тавтай морил.</h3>
-			<p>Сакайд хэрэглэгч бүр My Workspace гэж нэрлэгддэг өөрийн тусдаа ажлын хэсэгтэй байна. My
+			<p>Сакайд хэрэглэгч бүр Home гэж нэрлэгддэг өөрийн тусдаа ажлын хэсэгтэй байна. My
 			Workspace нь та хувийнхаа баримтуудыг хадгалж, шинэ сайт үүсгэж, хуваарь
 			гаргах, нөөцүүд хадгалах,болон өөр олон зүйлийг хийж болох хэсэг юм.</p>
 			<p class="instruction">Энд өгөгдсөн, шинэ хэрэглэгчид зориулсан мэдээллийг Сакайгаас өөрчилж болно.
diff --git a/reference/library/src/webapp/content/myworkspace_info_tr_TR.html b/reference/library/src/webapp/content/myworkspace_info_tr_TR.html
index af9cdf43a5a4..bc9cc055e5a3 100644
--- a/reference/library/src/webapp/content/myworkspace_info_tr_TR.html
+++ b/reference/library/src/webapp/content/myworkspace_info_tr_TR.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-		<title>My Workspace Information</title>
+		<title>Home Information</title>
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
 			var i, a, href
diff --git a/reference/library/src/webapp/content/webdav_instructions_mn.html b/reference/library/src/webapp/content/webdav_instructions_mn.html
index 5eeef9d55b9c..c0f4460cf0de 100755
--- a/reference/library/src/webapp/content/webdav_instructions_mn.html
+++ b/reference/library/src/webapp/content/webdav_instructions_mn.html
@@ -195,7 +195,7 @@ <h4>Mac (OS 10.4 - 10.6)-д WebDAV-ын тохиргоо хийх </h4>
 				<a name="linux_gnome"></a>
 				<h3>Linux (Gnome)-д WebDAV-ын тохиргоо хийх </h3>
 				
-				<p><strong>Анхаар</strong>:Linux-ын зарим хувилбарууд нь My Workspace-ын нөөцөд нэвтрэхэд асуудал гарч болзошгүй боловч бусад бүх сайтын төрлүүдрүү нэвтрэхэд зүгээр ажиллана (сургалт, төсөл, г.м).</p>
+				<p><strong>Анхаар</strong>:Linux-ын зарим хувилбарууд нь Home-ын нөөцөд нэвтрэхэд асуудал гарч болзошгүй боловч бусад бүх сайтын төрлүүдрүү нэвтрэхэд зүгээр ажиллана (сургалт, төсөл, г.м).</p>
 				<ol>
 					<li> <b>Places &gt; Connect to Server...</b>-руу ор</li>
 					<li> <b>Service type</b> дахь WebDav-ыг сонго <span class="webDavService"></span>.</li>
@@ -217,7 +217,7 @@ <h3>Linux (Gnome)-д WebDAV-ын тохиргоо хийх </h3>
 				<a name="linux_kde"></a>
 				<h3>Linux (KDE)-д WebDAV-ын тохиргоо хийх </h3>
 				
-				<p><strong>Анхаар</strong>: Linux-ын зарим хувилбарууд нь My Workspace-ын нөөцөд нэвтрэхэд асуудал гарч болзошгүй боловч бусад бүх сайтын төрлүүдрүү нэвтрэхэд зүгээр ажиллана (сургалт, төсөл, г.м).</p>
+				<p><strong>Анхаар</strong>: Linux-ын зарим хувилбарууд нь Home-ын нөөцөд нэвтрэхэд асуудал гарч болзошгүй боловч бусад бүх сайтын төрлүүдрүү нэвтрэхэд зүгээр ажиллана (сургалт, төсөл, г.м).</p>
 				<ol>
 					<li>Файл менежерыг нээ <em>(Dolphin)</em>.</li>
 					<li>Зүүн тал дахь <strong>Places</strong>-д <b>Network</b>-ыг сонго.</li>
diff --git a/reference/library/src/webapp/content/webdav_instructions_sv.html b/reference/library/src/webapp/content/webdav_instructions_sv.html
index 9ae52084e143..813f547deaaa 100644
--- a/reference/library/src/webapp/content/webdav_instructions_sv.html
+++ b/reference/library/src/webapp/content/webdav_instructions_sv.html
@@ -209,7 +209,7 @@ <h4>Konfigurera WebDAV för Mac (OS 10,4 till 10,6)</h4>
 				<h3>Konfigurera WebDAV för Linux (Gnome)</h3>
 				
 				<p><strong>OBS</strong>: Vissa versioner av Linux kan ha problem att
- få tillgång My Workspace resurser, men tillgång till alla andra sajter 
+ få tillgång Home resurser, men tillgång till alla andra sajter 
 typer kommer att fungera bra (kurs, projekt etc.).</p>
 				<ol>
 					<li>Gå till <b>Platser&gt; Anslut till server ...</b></li>
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages.properties
index d2e0ff57edac..40ab983301a9 100644
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages.properties
@@ -125,7 +125,7 @@ SiteEmailNotificationRWiki.28=\ has been modified
 SiteEmailNotificationRWiki.30=This automatic notification message was sent by 
 SiteEmailNotificationRWiki.3=) from the 
 SiteEmailNotificationRWiki.35=\ site.\n
-SiteEmailNotificationRWiki.36=You can modify how you receive notifications at My Workspace > Preferences.
+SiteEmailNotificationRWiki.36=You can modify how you receive notifications at Home > Preferences.
 XLSTChangesHandler.19=Change History for 
 XLSTChangesHandler.21=Recent Changes in 
 XLSTChangesHandler.23=Recent Changes in 
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_en_GB.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_en_GB.properties
index 6de336bbac29..ad81e5eec24b 100644
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_en_GB.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_en_GB.properties
@@ -124,7 +124,7 @@ SiteEmailNotificationRWiki.28=\ has been modified
 SiteEmailNotificationRWiki.30=This automatic notification message was sent by 
 SiteEmailNotificationRWiki.3=) from the 
 SiteEmailNotificationRWiki.35=\ site.\n
-SiteEmailNotificationRWiki.36=You can modify how you receive notifications at My Workspace > Preferences.
+SiteEmailNotificationRWiki.36=You can modify how you receive notifications at Home > Preferences.
 XLSTChangesHandler.19=Change History for 
 XLSTChangesHandler.21=Recent Changes in 
 XLSTChangesHandler.23=Recent Changes in 
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_fr_CA.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_fr_CA.properties
index 9dfd9b73e192..d2624b33de3f 100644
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_fr_CA.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_fr_CA.properties
@@ -109,7 +109,7 @@ RWikiObjectServiceImpl.30=archivage\: Termin\u00E9
 RWikiObjectServiceImpl.90=\ erreurs
 RWikiObjectServiceImpl.29=Page
 RWikiObjectServiceImpl.28=existe d\u00E9j\u00E0 avec r\u00E9vision
-SiteEmailNotificationRWiki.36=Vous pouvez modifier la fa\u00E7on de recevoir les notifications dans My Workspace > Pr\u00E9f\u00E9rences.
+SiteEmailNotificationRWiki.36=Vous pouvez modifier la fa\u00E7on de recevoir les notifications dans Home > Pr\u00E9f\u00E9rences.
 RWikiObjectServiceImpl.89=\ \u00E9checs, 
 SiteEmailNotificationRWiki.35=\ site.\r\n
 RWikiObjectServiceImpl.88=\ rejets, 
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_mn.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_mn.properties
index cdb29a862775..937acbe71fc9 100755
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_mn.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_mn.properties
@@ -129,7 +129,7 @@ SiteEmailNotificationRWiki.28=\ \u04E9\u04E9\u0440\u0447\u043B\u04E9\u0433\u0434
 SiteEmailNotificationRWiki.30=\u044D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u0433\u0434\u044D\u043B\u0438\u0439\u043D \u043C\u044D\u0441\u0441\u0435\u0436 ...-\u0441 \u0438\u0440\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430
 SiteEmailNotificationRWiki.3=) ...-\u0430\u0430\u0441
 SiteEmailNotificationRWiki.35=\ site.\n
-SiteEmailNotificationRWiki.36= \u043C\u044D\u0434\u044D\u0433\u0434\u044D\u043B\u04AF\u04AF\u0434\u0438\u0439\u043D \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 My Workspace > Preferences-\u0434 \u04E9\u04E9\u0440\u0447\u0438\u043B\u0436 \u0431\u043E\u043B\u043D\u043E.
+SiteEmailNotificationRWiki.36= \u043C\u044D\u0434\u044D\u0433\u0434\u044D\u043B\u04AF\u04AF\u0434\u0438\u0439\u043D \u044F\u0430\u0436 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 Home > Preferences-\u0434 \u04E9\u04E9\u0440\u0447\u0438\u043B\u0436 \u0431\u043E\u043B\u043D\u043E.
 XLSTChangesHandler.19=\u0441\u04AF\u04AF\u043B\u0438\u0439\u043D \u04AF\u0439\u043B\u0434\u043B\u0438\u0439\u0433 \u04E9\u04E9\u0440\u0447\u0438\u043B\u0441\u04E9\u043D 
 XLSTChangesHandler.21=\u0441\u0430\u044F\u0445\u0430\u043D \u0445\u0438\u0439\u0441\u044D\u043D \u04E9\u04E9\u0440\u0447\u0438\u043B\u0442\u04AF\u04AF\u0434 \u043E\u0440\u043B\u043E\u043E. 
 XLSTChangesHandler.23=\u0441\u0430\u044F\u0445\u0430\u043D \u0445\u0438\u0439\u0441\u044D\u043D \u04E9\u04E9\u0440\u0447\u0438\u043B\u0442\u04AF\u04AF\u0434 \u043E\u0440\u043B\u043E\u043E. 
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_tr_TR.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_tr_TR.properties
index 554e7d356dee..9353d8ad289f 100644
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_tr_TR.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_tr_TR.properties
@@ -125,7 +125,7 @@ SiteEmailNotificationRWiki.28=\ has been modified
 SiteEmailNotificationRWiki.30=This automatic notification message was sent by 
 SiteEmailNotificationRWiki.3=) from the 
 SiteEmailNotificationRWiki.35=\ site.\n
-SiteEmailNotificationRWiki.36=You can modify how you receive notifications at My Workspace > Preferences.
+SiteEmailNotificationRWiki.36=You can modify how you receive notifications at Home > Preferences.
 XLSTChangesHandler.19=Change History for 
 XLSTChangesHandler.21=Recent Changes in 
 XLSTChangesHandler.23=Recent Changes in 
diff --git a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_vi.properties b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_vi.properties
index 211a8caaf69d..ab407490f451 100644
--- a/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_vi.properties
+++ b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/component/bundle/Messages_vi.properties
@@ -4,7 +4,7 @@
 #
 #Tue Sep 07 15:05:29 PDT 2010
 BlockMacro.01=ki\u1EC3u m\u1EABu\: phong c\u00E1ch css \u0111\u1EC3 \u00E1p d\u1EE5ng n\u1ED9i tuy\u1EBFn 
-SiteEmailNotificationRWiki.36=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. 
+SiteEmailNotificationRWiki.36=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences. 
 SiteEmailNotificationRWiki.35=trang web.\n 
 SiteEmailNotificationRWiki.30=Th\u00F4ng b\u00E1o t\u1EF1 \u0111\u1ED9ng s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EB1ng 
 SiteEmailNotificationRWiki.28=\u0111\u00E3 \u0111\u01B0\u1EE3c s\u1EEDa \u0111\u1ED5i 
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
index 6c4f3090ba45..0f28d9022561 100755
--- a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
+++ b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
@@ -568,4 +568,4 @@ qprogress_questions=question(s)
 receiptEmail_none = You have elected not to receive an email receipt for Tests & Quizzes submissions.
 receiptEmail_digest = You will receive a receipt for this submission as part of your daily Tests & Quizzes submission summary email.
 receiptEmail_immediate = You will receive an email receipt for this submission.
-receiptEmail_changeSetting = You can change your email notification settings via My Workspaces -> Preferences -> Notifications.
+receiptEmail_changeSetting = You can change your email notification settings via Home -> Preferences -> Notifications.
diff --git a/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/bundle/EmailNotificationMessages.properties b/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/bundle/EmailNotificationMessages.properties
index 5e473ea0a988..0999fe93c9ae 100644
--- a/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/bundle/EmailNotificationMessages.properties
+++ b/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/bundle/EmailNotificationMessages.properties
@@ -1,2 +1,2 @@
-changeSetting_student = Control what email notifications you receive at My Workspace -> Preferences -> Notifications
+changeSetting_student = Control what email notifications you receive at Home -> Preferences -> Notifications
 changeSetting_instructor = You are receiving this message because this assessment has been set to send submission notifications via email.
diff --git a/search/search-util/src/test/org/sakaiproject/search/util/test/validxhtml.html b/search/search-util/src/test/org/sakaiproject/search/util/test/validxhtml.html
index a074a89858b7..b5165a48d7d6 100644
--- a/search/search-util/src/test/org/sakaiproject/search/util/test/validxhtml.html
+++ b/search/search-util/src/test/org/sakaiproject/search/util/test/validxhtml.html
@@ -36,7 +36,7 @@
 				<a id="sitetabs" class="skip" name="sitetabs"></a>
 				<h1 class="skip">Worksites begin here</h1>
 				<ul id="siteLinkList">
-						<li><a href="http://localhost:8080/portal/site/%7Eadmin" target="_parent" title="My Workspace"><span>My Workspace</span></a></li>
+						<li><a href="http://localhost:8080/portal/site/%7Eadmin" target="_parent" title="Home"><span>Home</span></a></li>
 							<li><a href="http://localhost:8080/portal/site/!admin" target="_parent" title="Administration Workspace worksite"><span>Administration Workspace</span></a></li>
 
 							<li class="selectedTab"><a href="#"><span>asdfsadfsa</span></a></li>
diff --git a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider.properties b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider.properties
index 1594ed978418..0870f572b08d 100644
--- a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider.properties
+++ b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider.properties
@@ -1,76 +1,9 @@
-java.sitenoti = Site Notification
-java.newusernoti = New User Notification
-java.addedto = You have been added to
-java.following = You have been added to the following
-java.simplesite = site:
+java.sitenoti = Site Notification
java.newusernoti = New User Notification
java.addedto = You have been added to
java.following = You have been added to the following
java.simplesite = site:
 java.simpleby = by
 java.passwordis1 = Your password is
-java.passwordis2 = You can later go to the Account tool in your My Workspace site to reset it.
+java.passwordis2 = You can later go to the Account tool in your Home site to reset it.
 
+
java.togeta1 = To get a guest account, open the following site:
java.togeta2 = and follow the steps listed.
java.once = Once you have your guest account, you can log in to
 
-java.togeta1 = To get a guest account, open the following site:
-java.togeta2 = and follow the steps listed.
-java.once = Once you have your guest account, you can log in to
-
-java.loginhow1 = 1. Open
-java.loginhow2 = 2. Click the Login button.
-java.loginhow3 = 3. Type your guest account login and password, and click Login.
-java.tolog = To log in:
-java.loginhow3u = 3. Type your username and password, and click Login.
-java.tabscreen = 4. Go to the site, click on the site tab. (You will see two or more tabs in a row across the upper part of the screen.)
-
-java.sitereqfrom = Site Request from
-java.for = for
-java.hello = Hello,
-java.receiv = You are receiving this message at the recommendation of
-java.who = who has requested an official course website for the following class(es):
-java.sitetitle = Site title:
-java.siteid = Site id:
-java.siteinstr = Special Instruction:
-java.according = According to our data sources,
-java.record = is not the instructor of record.
-java.canyou = Can you verify that
-java.assoc = is associated with the class(es) listed above?
-java.respond = Please respond to this message with information about
-java.appoint = 's appointment and the legitimacy of this site request. If you feel unable to respond, please forward this message to a departmental contact with the authority to approve or deny the request.
-java.thanks = Thank you,
-java.support = Support Team
-java.sitereqfrom = Site Request from
-java.to = To:
-java.supp = Support
-java.from = From:
-java.subj = Subj:
-java.sitereq = Site Request
-java.sitechreq = Site Change Request
-java.date = Date:
-java.approval = I am requesting approval of a
-java.coursesite = Course Site for 
-java.approval2 = I am requesting approval of access to a
-java.forthese = for these
-java.on = on
-java.withrost = with access to rosters for these
-java.withrost2 = with access to roster for this section:
-java.course2 = course:
-java.sections = sections:
-java.forthis = for this section:
-java.name = Name:
-java.email = Email:
-java.sitetitle = Site title:
-java.siteid = Site id:
-java.siteinstr = Special Instruction:
-java.authoriz = The site request authorization email has been sent successfully to username
-java.asreq = as requested.
-java.thesiteemail = The site request authorization email could not be sent to username
-java.isbeing = Your request is being processed. You will receive email when the class roster has been added to your site.
-java.meantime = In the meantime, you can continue with the site setup process and add course materials to your site.
-java.copy = This is a copy of the Course Site request that you made.
-java.wish = If you wish to provide additional information, please send email to
-java.official = Official Course Site created by
-java.site.createdBy = Site created by
-java.site = Site
-java.fromwork = From Worksite Setup to
-java.off = Official Course Site
-java.wasset = was set up by
-java.siteCreation.confirmation=Your site {0} has been successfully created. Following is a copy of Site Creation Email sent to {1} Support:
-java.siteImport.confirmation.subject=Site Import completed for {0}
-java.siteImport.confirmation=The import process you started for {0} has completed. Visit the site to view the imported materials: {1}
\ No newline at end of file
+java.loginhow1 = 1. Open
java.loginhow2 = 2. Click the Login button.
java.loginhow3 = 3. Type your guest account login and password, and click Login.
+java.tolog = To log in:
java.loginhow3u = 3. Type your username and password, and click Login.
java.tabscreen = 4. Go to the site, click on the site tab. (You will see two or more tabs in a row across the upper part of the screen.)

java.sitereqfrom = Site Request from
java.for = for
java.hello = Hello,
java.receiv = You are receiving this message at the recommendation of
java.who = who has requested an official course website for the following class(es):
java.sitetitle = Site title:
java.siteid = Site id:
java.siteinstr = Special Instruction:
java.according = According to our data sources,
java.record = is not the instructor of record.
java.canyou = Can you verify that
java.assoc = is associated with the class(es) listed above?
java.respond = Please respond to this message with information about
java.appoint = 's appointment and the legitimacy of this site request. If you feel unable to respond, please forward this message to a departmental contact with the authority to approve or deny the request.
java.thanks = Thank you,
java.support = Support Team
java.sitereqfrom = Site Request from
java.to = To:
java.supp = Support
java.from = From:
java.subj = Subj:
java.sitereq = Site Request
java.sitechreq = Site Change Request
java.date = Date:
java.approval = I am requesting approval of a
java.coursesite = Course Site for 
java.approval2 = I am requesting approval of access to a
java.forthese = for these
java.on = on
java.withrost = with access to rosters for these
java.withrost2 = with access to roster for this section:
java.course2 = course:
java.sections = sections:
java.forthis = for this section:
java.name = Name:
java.email = Email:
java.sitetitle = Site title:
java.siteid = Site id:
java.siteinstr = Special Instruction:
java.authoriz = The site request authorization email has been sent successfully to username
java.asreq = as requested.
java.thesiteemail = The site request authorization email could not be sent to username
java.isbeing = Your request is being processed. You will receive email when the class roster has been added to your site.
java.meantime = In the meantime, you can continue with the site setup process and add course materials to your site.
java.copy = This is a copy of the Course Site request that you made.
java.wish = If you wish to provide additional information, please send email to
java.official = Official Course Site created by
java.site.createdBy = Site created by
java.site = Site
java.fromwork = From Worksite Setup to
java.off = Official Course Site
java.wasset = was set up by
java.siteCreation.confirmation=Your site {0} has been successfully created. Following is a copy of Site Creation Email sent to {1} Support:
java.siteImport.confirmation.subject=Site Import completed for {0}
java.siteImport.confirmation=The import process you started for {0} has completed. Visit the site to view the imported materials: {1}
diff --git a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_mn.properties b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_mn.properties
index e3ff522e75db..f356cef21870 100755
--- a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_mn.properties
+++ b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_mn.properties
@@ -10,7 +10,7 @@ java.following = \u0422\u0430\u043D\u044B\u0433 \u0434\u0430\u0440\u0430\u0430\u
 java.simplesite = \u0421\u0430\u0439\u0442:
 java.simpleby = -\u0430\u0430\u0441
 java.passwordis1 = \u0422\u0430\u043D\u044B \u043D\u0443\u0443\u0446 \u04AF\u0433 
-java.passwordis2 = \u0422\u0430 reset \u0445\u0438\u0439\u0445\u0438\u0439\u043D \u0442\u0443\u043B\u0434 My Workspace \u0441\u0430\u0439\u0442 \u0434\u0430\u0445\u044C \u0411\u04AF\u0440\u0442\u0433\u044D\u043B\u0438\u0439\u043D \u0445\u044D\u0440\u044D\u0433\u0441\u044D\u043B\u0440\u04AF\u04AF \u0434\u0430\u0440\u0430\u0430 \u043E\u0440\u0436 \u0431\u043E\u043B\u043D\u043E
+java.passwordis2 = \u0422\u0430 reset \u0445\u0438\u0439\u0445\u0438\u0439\u043D \u0442\u0443\u043B\u0434 Home \u0441\u0430\u0439\u0442 \u0434\u0430\u0445\u044C \u0411\u04AF\u0440\u0442\u0433\u044D\u043B\u0438\u0439\u043D \u0445\u044D\u0440\u044D\u0433\u0441\u044D\u043B\u0440\u04AF\u04AF \u0434\u0430\u0440\u0430\u0430 \u043E\u0440\u0436 \u0431\u043E\u043B\u043D\u043E
 
 java.togeta1 = \u0417\u043E\u0447\u043D\u044B \u0431\u04AF\u0440\u0442\u0433\u044D\u043B\u0438\u0439\u0433 \u0430\u0432\u0430\u0445 \u0431\u043E\u043B \u0434\u0430\u0440\u0430\u0430\u0445 \u0441\u0430\u0439\u0442\u044B\u0433 \u043D\u044D\u044D\u043D\u044D \u04AF\u04AF:
 java.togeta2 = \u0416\u0430\u0433\u0441\u0430\u0430\u0441\u0430\u043D \u04AF\u0435 \u0448\u0430\u0442\u0443\u0443\u0434\u044B\u0433 \u0434\u0430\u0433\u0430\u043D\u0430 \u0443\u0443.
diff --git a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_vi.properties b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_vi.properties
index 1a78e03921a1..8a6034bbfa09 100644
--- a/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_vi.properties
+++ b/site-manage/site-manage-impl/impl/src/bundle/UserNotificationProvider_vi.properties
@@ -8,7 +8,7 @@ java.following=B\u1EA1n \u0111\u00E3 \u0111\u01B0\u1EE3c th\u00EAm v\u00E0o sau
 java.once=M\u1ED9t khi b\u1EA1n c\u00F3 t\u00E0i kho\u1EA3n kh\u00E1ch c\u1EE7a b\u1EA1n, b\u1EA1n c\u00F3 th\u1EC3 \u0111\u0103ng nh\u1EADp v\u00E0o 
 java.sitenoti=Trang web Th\u00F4ng b\u00E1o 
 java.tabscreen=4. T\u1EDBi trang web, click v\u00E0o tab trang web. (B\u1EA1n s\u1EBD th\u1EA5y hai ho\u1EB7c nhi\u1EC1u tab trong m\u1ED9t h\u00E0ng tr\u00EAn kh\u1EAFp ph\u1EA7n tr\u00EAn c\u1EE7a m\u00E0n h\u00ECnh.) 
-java.passwordis2=B\u1EA1n sau \u0111\u00F3 c\u00F3 th\u1EC3 v\u00E0o c\u00F4ng c\u1EE5 t\u00E0i kho\u1EA3n v\u00E0o trang web c\u1EE7a My Workspace c\u1EE7a b\u1EA1n \u0111\u1EC3 \u0111\u1EB7t l\u1EA1i n\u00F3. 
+java.passwordis2=B\u1EA1n sau \u0111\u00F3 c\u00F3 th\u1EC3 v\u00E0o c\u00F4ng c\u1EE5 t\u00E0i kho\u1EA3n v\u00E0o trang web c\u1EE7a Home c\u1EE7a b\u1EA1n \u0111\u1EC3 \u0111\u1EB7t l\u1EA1i n\u00F3. 
 java.passwordis1=M\u1EADt kh\u1EA9u c\u1EE7a b\u1EA1n 
 java.newusernoti=Th\u00F4ng b\u00E1o cho ng\u01B0\u1EDDi d\u00F9ng m\u1EDBi  
 java.simplesite=trang web\: \t 
diff --git a/site-manage/site-manage-impl/impl/src/bundle/notifyNewuser.xml b/site-manage/site-manage-impl/impl/src/bundle/notifyNewuser.xml
index 5baf805f6449..4cbc0b9b818f 100644
--- a/site-manage/site-manage-impl/impl/src/bundle/notifyNewuser.xml
+++ b/site-manage/site-manage-impl/impl/src/bundle/notifyNewuser.xml
@@ -12,7 +12,7 @@
 	2) Login using:
 		User Id: 	${userEid}
 		password: 	${newPassword} 
- You can change your password after you have logged in, using the Account tool in your My Workspace.
+ You can change your password after you have logged in, using the Account tool in your Home.
  
  (This is an automated message from ${localSakaiName}.)
 </message>
@@ -189,7 +189,7 @@ Mais tarde voc\u00ea pode ir a ferramenta Conta em seu &quot;Meu site&quot; para
 	2) Доорхийг ашиглан нэвтэрнэ:
 		Хэрэглэгчийн Id: 	${userEid}
 		Нууц үг: 	${newPassword} 
- Та нэвтэрснийхээ дараа My Workspace дахь бүртгэлийн хэрэгслийг ашиглан нууц үгээ өөрчилж болно.
+ Та нэвтэрснийхээ дараа Home дахь бүртгэлийн хэрэгслийг ашиглан нууц үгээ өөрчилж болно.
  
  (Энэ нь ${localSakaiName}-аас ирсэн автомат мессеж байна.)
 </message>
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
index ed45a6927811..bbe47d9f69f6 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
@@ -2,7 +2,7 @@
 java.allmy = All My Sites
 java.myActive = My Active Sites
 java.myInactive = My Inactive Sites
-java.my = My Workspace
+java.my = Home
 ### java.yoursite = Your site set up is complete. You may now add content to and then publish your site.
 java.nosites = No site(s) checked. Please check a site or sites.
 ### (moot) java.youhave = You have not checked any features for your site. You may do this by click the Back button or later by clicking Edit, then Add or remove features.
@@ -334,7 +334,7 @@ list.moreinfotooltip=More information on this site
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -528,7 +528,7 @@ sinfo.language.defaultUserLanguage = User Language (default)
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
@@ -985,13 +985,13 @@ sitdup.dupscoredata = Copy {0} selections for gradebook items
 sitegen.sitedel.remov = Removing Site...
 sitegen.sitedel.alert = Alert:
 sitegen.sitedel.deleting = Deleting a site removes all content and cannot be undone.
-sitegen.sitedel.deleting1 = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin the site.
+sitegen.sitedel.deleting1 = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin the site.
 sitegen.sitedel.you = You have selected the following site for removal:
 sitegen.sitedel.you2=You have selected the following sites for removal:
 sitegen.sitedel.remove = Remove
 sitegen.sitedel.cancel = Cancel
 sitegen.sitedel.remov.soft = Softly Deleting Site...
-sitegen.sitedel.soft = This site will be 'softly deleted' but will remain accessible to you via the "View softly deleted Sites" option in the Worksite Setup tool which is found in My Workspace. It will eventually be purged as per the schedule set by your System Administrator.\
+sitegen.sitedel.soft = This site will be 'softly deleted' but will remain accessible to you via the "View softly deleted Sites" option in the Worksite Setup tool which is found in Home. It will eventually be purged as per the schedule set by your System Administrator.\
 <p>Participants will no longer be able to access the site, however the contents of the site will be preserved and you can restore access to the site at any time before it is purged.</p>
 sitegen.sitedel.you.soft = You have selected the following site for soft deletion:
 sitegen.sitedel.you2.soft=You have selected the following sites for soft deletion:
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_ca.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_ca.properties
index 69bcbd5dd0b0..23d5eeff46ba 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_ca.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_ca.properties
@@ -334,7 +334,7 @@ list.moreinfotooltip=M\u00e9s informaci\u00f3 de l'espai
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -528,7 +528,7 @@ sinfo.language.defaultUserLanguage=Idioma de l'usuari (predeterminat)
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_de.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_de.properties
index e7242cf8bd34..38673fc5c24f 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_de.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_de.properties
@@ -323,7 +323,7 @@ list.moreinfotooltip=Weitere Informationen zu dieser Site
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -499,7 +499,7 @@ sinfo.language.defaultUserLanguage = Benutzersprache (Standard)
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_en_GB.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_en_GB.properties
index ce1215965226..2bce0cbdef84 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_en_GB.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_en_GB.properties
@@ -27,6 +27,6 @@ sitdup.dupaclacourse=Duplicating a course site will create a new course site wit
 man.siteroster=Class Member List(s)
 sitegen.siteinfolist.sortcredas=Sort students in ascending order of credits earned
 man.enter=Enter class information for the member list(s) you would like to have access to your site. A
-sitegen.sitedel.soft = This site will be 'softly deleted' but will remain accessible to you via the "View softly deleted Sites" option in the Worksite Setup tool which is found in My Workspace. It will eventually be purged as per the schedule set by your System Administrator.\
+sitegen.sitedel.soft = This site will be 'softly deleted' but will remain accessible to you via the "View softly deleted Sites" option in the Worksite Setup tool which is found in Home. It will eventually be purged as per the schedule set by your System Administrator.\
 <p>Participants will no longer be able to access the site, however the contents of the site will be preserved and you can restore access to the site at any time before it is purged.</p>
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_es.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_es.properties
index 3dec8e99f829..c5375c3afd5d 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_es.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_es.properties
@@ -334,7 +334,7 @@ list.moreinfotooltip=M\u00e1s informaci\u00f3n del sitio
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -528,7 +528,7 @@ sinfo.language.defaultUserLanguage=Definido por el usuario (defecto)
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_hi_IN.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_hi_IN.properties
index d0dbc859a5be..aa976ef81594 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_hi_IN.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_hi_IN.properties
@@ -328,7 +328,7 @@ list.moreinfotooltip=\u0907\u0938 \u0938\u093e\u0907\u091f \u092a\u0930 \u0905\u
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -520,7 +520,7 @@ sinfo.language.defaultUserLanguage=\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u0
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_it.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_it.properties
index 7515d0f3135e..44a07e68f214 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_it.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_it.properties
@@ -324,7 +324,7 @@ list.moreinfotooltip=Ulteriori informazioni su questo sito
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -500,7 +500,7 @@ sinfo.language.defaultUserLanguage = Lingua dell'utente (predefinita)
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_mn.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_mn.properties
index 13a7349864fb..76893820f824 100755
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_mn.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_mn.properties
@@ -330,7 +330,7 @@ list.moreinfotooltip= \u042D\u043D\u044D \u0441\u0430\u0439\u0442 \u0434\u044D\u
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -504,7 +504,7 @@ sinfo.language.defaultUserLanguage = \u0425\u044D\u0440\u044D\u0433\u043B\u044D\
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_zh_CN.properties b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_zh_CN.properties
index 2e1edf406308..cda4c103bcf0 100644
--- a/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_zh_CN.properties
+++ b/site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_zh_CN.properties
@@ -329,7 +329,7 @@ list.moreinfotooltip=\u7AD9\u70B9\u7684\u66F4\u591A\u4FE1\u606F
 #Removing Vm
 ### (moot) rem.remsite = Removing Site...
 ### (moot) rem.youhave = You have selected the following site for removal:
-### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) rem.deleting = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) rem.remove = Remove
 
 ## multiple tools vm
@@ -519,7 +519,7 @@ sinfo.language.defaultUserLanguage=\u7528\u6237\u5F53\u524D\u8BED\u8A00\uFF08\u9
 
 ### (moot) sitdelcon.alert   = Alert
 ### (moot) sitdelcon.can     = Cancel
-### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your My Workspace to unjoin yourself from the site.
+### (moot) sitdelcon.delasit = Deleting a site removes the entire site's content and is not recoverable - no one else will be able to access the deleted site. If you are trying to remove yourself from the site, use the Membership tool in your Home to unjoin yourself from the site.
 ### (moot) sitdelcon.remsit  = Removing Site...
 ### (moot) sitdelcon.sav     = Save
 
diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
index 8b053f9d0fc2..e42d80cb06e6 100644
--- a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
+++ b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm
@@ -720,7 +720,7 @@
 							#end
 							<td class="screenOnly">
 								#if ($participant.isRemoveable())
-									## if in My Workspace site, cannot move the site user from it
+									## if in Home site, cannot move the site user from it
 									#if (!$!isMyWorkspace || ($!isMyWorkspace && !$uniqname.equals($!siteUserId)))
 									<label  for="remove_$uniqname"><span class="skip">$tlang.getString("sitegen.siteinfolist.remove") $participant.getDisplayId()</span></label><input type="checkbox" name="selectedUser" value="$uniqname" id="remove_$uniqname"
 											#foreach($participantSelected in $selectedParticipants)
diff --git a/site/site-tool/tool/src/bundle/admin.properties b/site/site-tool/tool/src/bundle/admin.properties
index b580c21e7891..1b5c3bb53e5d 100644
--- a/site/site-tool/tool/src/bundle/admin.properties
+++ b/site/site-tool/tool/src/bundle/admin.properties
@@ -5,7 +5,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site      = Site {0} not found
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_ca.properties b/site/site-tool/tool/src/bundle/admin_ca.properties
index 0220ccdb9fe0..868d791d2409 100644
--- a/site/site-tool/tool/src/bundle/admin_ca.properties
+++ b/site/site-tool/tool/src/bundle/admin_ca.properties
@@ -5,7 +5,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site=No s''ha trobat l''espai {0} 
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_de.properties b/site/site-tool/tool/src/bundle/admin_de.properties
index 1e54ce2d66df..2f20bd1055ed 100644
--- a/site/site-tool/tool/src/bundle/admin_de.properties
+++ b/site/site-tool/tool/src/bundle/admin_de.properties
@@ -5,7 +5,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site      = Site {0} nicht gefunden
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_es.properties b/site/site-tool/tool/src/bundle/admin_es.properties
index 4e203f9d98c7..388d6e7a69f8 100644
--- a/site/site-tool/tool/src/bundle/admin_es.properties
+++ b/site/site-tool/tool/src/bundle/admin_es.properties
@@ -5,7 +5,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site=Asignatura {0} no encontrada
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_fr_FR.properties b/site/site-tool/tool/src/bundle/admin_fr_FR.properties
index 629a9145475b..722679ccf683 100644
--- a/site/site-tool/tool/src/bundle/admin_fr_FR.properties
+++ b/site/site-tool/tool/src/bundle/admin_fr_FR.properties
@@ -6,7 +6,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site=L'espace {0} est introuvable
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_hi_IN.properties b/site/site-tool/tool/src/bundle/admin_hi_IN.properties
index 524f50229d4d..0db5362d4df6 100644
--- a/site/site-tool/tool/src/bundle/admin_hi_IN.properties
+++ b/site/site-tool/tool/src/bundle/admin_hi_IN.properties
@@ -6,7 +6,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site=\u0938\u093e\u0907\u091f {0} \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u093e
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_it.properties b/site/site-tool/tool/src/bundle/admin_it.properties
index b5c2376c1861..4f1e805c2672 100644
--- a/site/site-tool/tool/src/bundle/admin_it.properties
+++ b/site/site-tool/tool/src/bundle/admin_it.properties
@@ -5,7 +5,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site      = Sito {0} non trovato
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_mn.properties b/site/site-tool/tool/src/bundle/admin_mn.properties
index bcbc2ddbdb86..0a28c70353cf 100644
--- a/site/site-tool/tool/src/bundle/admin_mn.properties
+++ b/site/site-tool/tool/src/bundle/admin_mn.properties
@@ -10,7 +10,7 @@
 ### (moot) sitact.notfou    = not found
 ### (moot) sitact.site      = Site
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/site/site-tool/tool/src/bundle/admin_zh_CN.properties b/site/site-tool/tool/src/bundle/admin_zh_CN.properties
index 2a671dee6533..8ce0a6ea6e92 100644
--- a/site/site-tool/tool/src/bundle/admin_zh_CN.properties
+++ b/site/site-tool/tool/src/bundle/admin_zh_CN.properties
@@ -4,7 +4,7 @@
 ### (moot) sitact.notfou    = not found
 sitact.site=\u627E\u4E0D\u5230\u7AD9\u70B9{0}
 ### (moot) sitact.somone    = Someone else is currently editing this Site:
-### (moot) sitact.usermy    = Users My Workspaces
+### (moot) sitact.usermy    = Users Homes
 ### (moot) sitact.youdonot1 = You do not have permission to edit Site
 ### (moot) sitconrem.sav    = Save
 ### (moot) sitedi.term		    = Term:
diff --git a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
index 8af5b31f6944..ca652cb5efef 100644
--- a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
+++ b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
@@ -405,7 +405,7 @@
 	<tool 
 		toolId="sakai.siteinfo"
 		selected="false">
-		<!-- Events below are generated with the contextId from the site that trigered the action (typically, My Workspace):
+		<!-- Events below are generated with the contextId from the site that trigered the action (typically, Home):
 		<event eventId="site.add" selected="true"/>
 		<event eventId="site.del" selected="true"/> -->
 		<event eventId="site.upd" selected="true"/>
diff --git a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef_sakai-2-5-x.xml b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef_sakai-2-5-x.xml
index 8d04f3d44c3f..d55adfe6ea25 100644
--- a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef_sakai-2-5-x.xml
+++ b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef_sakai-2-5-x.xml
@@ -384,7 +384,7 @@
 	<tool 
 		toolId="sakai.siteinfo"
 		selected="false">
-		<!-- Events below are generated with the contextId from the site that trigered the action (typically, My Workspace):
+		<!-- Events below are generated with the contextId from the site that trigered the action (typically, Home):
 		<event eventId="site.add" selected="true"/>
 		<event eventId="site.del" selected="true"/> -->
 		<event eventId="site.upd" selected="true"/>
diff --git a/syllabus/syllabus-impl/src/bundle/siteemacon.properties b/syllabus/syllabus-impl/src/bundle/siteemacon.properties
index 812fe11f9e35..bd63ef6c7cd0 100644
--- a/syllabus/syllabus-impl/src/bundle/siteemacon.properties
+++ b/syllabus/syllabus-impl/src/bundle/siteemacon.properties
@@ -28,7 +28,7 @@ site = site.
 
 this = This automatic notification message was sent by
 
-youcan = You can modify how you receive notifications at My Workspace > Preferences.
+youcan = You can modify how you receive notifications at Home > Preferences.
 
 syllabus.attachments.list = Attachments:
 
diff --git a/syllabus/syllabus-impl/src/bundle/siteemacon_eu.properties b/syllabus/syllabus-impl/src/bundle/siteemacon_eu.properties
index af1de1241f57..d5402d5c7001 100644
--- a/syllabus/syllabus-impl/src/bundle/siteemacon_eu.properties
+++ b/syllabus/syllabus-impl/src/bundle/siteemacon_eu.properties
@@ -44,7 +44,7 @@ site = gunea.
 
 this = Nork bidali duen jakinarazpen automatiko hau:
 
-youcan = Baduzu modua jakinarazpenak jasotzeko modua aldatzeko hemen: My Workspace-n > Lehentasunak.
+youcan = Baduzu modua jakinarazpenak jasotzeko modua aldatzeko hemen: Home-n > Lehentasunak.
 
 # properties in siteemacon.properties that are not present in siteemacon_eu.properties
 #Fri Dec 21 12:21:42 CET 2012
diff --git a/syllabus/syllabus-impl/src/bundle/siteemacon_mn.properties b/syllabus/syllabus-impl/src/bundle/siteemacon_mn.properties
index 37c11b94b638..99f23d018c64 100755
--- a/syllabus/syllabus-impl/src/bundle/siteemacon_mn.properties
+++ b/syllabus/syllabus-impl/src/bundle/siteemacon_mn.properties
@@ -49,7 +49,7 @@ site = \u0421\u0430\u0439\u0442.
 
 this = \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 ...............\u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430
 
-youcan = My Workspace > Preferences-\u0434 \u044F\u0430\u0436 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u04AF\u04AF\u0434\u0438\u0439\u0433 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0445\u0430\u0430 \u0437\u0430\u0441\u0430\u0436 \u0431\u043E\u043B\u043D\u043E.
+youcan = Home > Preferences-\u0434 \u044F\u0430\u0436 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u04AF\u04AF\u0434\u0438\u0439\u0433 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0445\u0430\u0430 \u0437\u0430\u0441\u0430\u0436 \u0431\u043E\u043B\u043D\u043E.
 
 syllabus.attachments.list = \u0425\u0430\u0432\u0441\u0440\u0430\u043B\u0442\u0443\u0443\u0434:
 
@@ -78,7 +78,7 @@ site = \u0421\u0430\u0439\u0442.
 
 this = \u042D\u043D\u044D \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u0438\u0439\u043D \u043C\u0435\u0441\u0441\u0435\u0436\u0438\u0439\u0433 ...............\u0438\u043B\u0433\u044D\u044D\u0441\u044D\u043D \u0431\u0430\u0439\u043D\u0430
 
-youcan = My Workspace > Preferences-\u0434 \u044F\u0430\u0436 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u04AF\u04AF\u0434\u0438\u0439\u0433 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 \u0437\u0430\u0441\u0430\u0436 \u0431\u043E\u043B\u043D\u043E.
+youcan = Home > Preferences-\u0434 \u044F\u0430\u0436 \u043C\u044D\u0434\u044D\u044D\u043B\u043B\u04AF\u04AF\u0434\u0438\u0439\u0433 \u0445\u04AF\u043B\u044D\u044D\u0436 \u0430\u0432\u0430\u0445\u0430\u0430 \u0437\u0430\u0441\u0430\u0436 \u0431\u043E\u043B\u043D\u043E.
 
 syllabus.attachments.list = \u0425\u0430\u0432\u0441\u0440\u0430\u043B\u0442\u0443\u0443\u0434:
 
diff --git a/syllabus/syllabus-impl/src/bundle/siteemacon_sv.properties b/syllabus/syllabus-impl/src/bundle/siteemacon_sv.properties
index 119d51e9aeda..a5612748ef71 100755
--- a/syllabus/syllabus-impl/src/bundle/siteemacon_sv.properties
+++ b/syllabus/syllabus-impl/src/bundle/siteemacon_sv.properties
@@ -44,10 +44,10 @@ site = sajt.
 
 this = Denna notifiering skickades av
 
-youcan = Du kan \u00C4ndra hur du tar emot notifieringar i My Workspace > Preferences.
+youcan = Du kan \u00C4ndra hur du tar emot notifieringar i Home > Preferences.
 syllabus.attachments.list=      Bilagor:
 event.syllabus.post.new=   [ {0} Nytt kurinformationsobjekt  ] {1}
 event.syllabus.post.changed=[ {0} Existerande Kursinformationsobjekt har \u00e4ndrats ] {1}
 event.syllabus.post.delete=     [ {0} Kursinformationsobjekt har raderats ] {1}
 event.syllabus.delete=              Kursinformationsobjekt - {0} f\u00f6r sajten - {1}  har raderats.
-subject=   \u00c4mne: {0}
\ No newline at end of file
+subject=   \u00c4mne: {0}
diff --git a/syllabus/syllabus-impl/src/bundle/siteemacon_vi.properties b/syllabus/syllabus-impl/src/bundle/siteemacon_vi.properties
index b8688df04074..aa6c95a4648a 100644
--- a/syllabus/syllabus-impl/src/bundle/siteemacon_vi.properties
+++ b/syllabus/syllabus-impl/src/bundle/siteemacon_vi.properties
@@ -18,7 +18,7 @@ forthe=t\u1EEB
 chan=Thay \u0111\u1ED5i 
 separator=---------------------- 
 sitat=trang web t\u1EA1i 
-youcan=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. 
+youcan=B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i Home > Preferences. 
 locsit=V\u1ECB tr\u00ED\: trang web 
 descrip=M\u00F4 t\u1EA3\: 
 reso=T\u00E0i nguy\u00EAn 
diff --git a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties
index ad2c3d963548..1a6040707c7d 100644
--- a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties
+++ b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs.properties
@@ -114,7 +114,7 @@ privacy_choice_hidden=Remain hidden in this site
 privacy_choice_visible=Make me visible in this site
 privacy_choice_later=Ask me again later
 
-privacy_change_later_instructions=To change your privacy settings in the future, visit<br />My Workspace > Preferences > Privacy Status
+privacy_change_later_instructions=To change your privacy settings in the future, visit<br />Home > Preferences > Privacy Status
 
 ## SAK-23895:Display full name of course, not just code, in site tab
 tabDisplay_prompt=Show tabs as:
diff --git a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_mn.properties b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_mn.properties
index ee9454d9cc41..801deeaba72f 100755
--- a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_mn.properties
+++ b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_mn.properties
@@ -116,7 +116,7 @@ privacy_choice_hidden=\u042D\u043D\u044D \u0441\u0430\u0439\u0442\u0434 \u043D\u
 privacy_choice_visible=\u042D\u043D\u044D \u0441\u0430\u0439\u0442\u0434 \u043D\u0430\u043C\u0430\u0439\u0433 \u0445\u0430\u0440\u0443\u0443\u043B
 privacy_choice_later=\u0414\u0430\u0440\u0430\u0430 \u0434\u0430\u0445\u0438\u043D \u0430\u0441\u0443\u0443
 
-privacy_change_later_instructions= \u0426\u0430\u0430\u0448\u0434\u0430\u0430 \u0445\u0443\u0432\u0438\u0439\u043D \u0445\u044D\u0440\u0433\u0438\u0439\u043D\u0445\u044D\u044D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E\u0433 \u0441\u043E\u043B\u0438\u0445 \u0431\u043E\u043B <br />My Workspace > Preferences > Privacy Status-\u0440\u0443\u0443 \u043E\u0440\u043E\u043E\u0440\u043E\u0439
+privacy_change_later_instructions= \u0426\u0430\u0430\u0448\u0434\u0430\u0430 \u0445\u0443\u0432\u0438\u0439\u043D \u0445\u044D\u0440\u0433\u0438\u0439\u043D\u0445\u044D\u044D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E\u0433 \u0441\u043E\u043B\u0438\u0445 \u0431\u043E\u043B <br />Home > Preferences > Privacy Status-\u0440\u0443\u0443 \u043E\u0440\u043E\u043E\u0440\u043E\u0439
 
 min_tabs = \u0427\u0438\u0433\u043B\u04AF\u04AF\u043B\u044D\u0445 \u043C\u04E9\u0440\u043D\u0438\u0439 \u0434\u044D\u044D\u0434 \u0442\u0430\u043B\u0434 \u0445\u0430\u043C\u0433\u0438\u0439\u043D \u0431\u0430\u0433\u0430\u0434\u0430\u0430 %d \u0447\u0438\u0445\u0442\u044D\u0439 \u0445\u0443\u0443\u0434\u0441\u0443\u0443\u0434 \u0431\u0430\u0439\u0445 \u0445\u044D\u0440\u044D\u0433\u0442\u044D\u0439.
 prefs_active_sites = \u0418\u0434\u044D\u0432\u0445\u0438\u0442\u044D\u0439 \u0441\u0430\u0439\u0442\u0443\u0443\u0434 (\u0442\u0430\u043D\u044B \u0448\u04AF\u04AF\u0433\u044D\u044D)
diff --git a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_sv.properties b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_sv.properties
index 9783760d3b96..26587eef54a7 100644
--- a/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_sv.properties
+++ b/user/user-tool-prefs/tool/src/bundle/user-tool-prefs_sv.properties
@@ -38,7 +38,7 @@ prefs_timezone_title=Tidszon
 prefs_title=Egenskaper
 privacy_change_directions=Om du vill \u00E4ndra din status, markera rutan intill
 privacy_change_directions2=och klicka p\u00E5 knappen Spara nedan.
-privacy_change_later_instructions=F\u00F6r att \n\u00E4ndra dina privata inst\u00E4llningar i framtiden, g\u00E5 till <br />My Workspace/Min arbetsyta > Preferences/Inst\u00E4llningar > Privacy Status/
+privacy_change_later_instructions=F\u00F6r att \n\u00E4ndra dina privata inst\u00E4llningar i framtiden, g\u00E5 till <br />Home/Min arbetsyta > Preferences/Inst\u00E4llningar > Privacy Status/
 privacy_check_hide=D\u00F6lj mig
 privacy_check_show=G\u00F6r mig synlig
 privacy_choice_heading=S\u00E4tt inst\u00E4llningar f\u00F6r dina privatstatus
@@ -50,7 +50,7 @@ privacy_hidden=Dold
 privacy_hide_all=D\u00F6lj mig p\u00E5 alla sajter
 privacy_hide_all_set=Din status \u00E4r nu satt till dold p\u00E5 alla sajter. Andra kan inte se ditt namn i Roster/deltagarlista och kan inte kontakta dig genom sajten.
 privacy_hide_title=S\u00E4tt till dold p\u00E5 alla sajter
-privacy_note=Notera\: F\u00F6r att visa din status p\u00E5 andra sajter, v\u00E4lj 'Preferences/Inst\u00E4llningar' fr\u00E5n din 'My Workspace/Min arbetsyta'.
+privacy_note=Notera\: F\u00F6r att visa din status p\u00E5 andra sajter, v\u00E4lj 'Preferences/Inst\u00E4llningar' fr\u00E5n din 'Home/Min arbetsyta'.
 privacy_show_all=G\u00F6r mig synlig p\u00E5 alla sajter
 privacy_show_all_set=Din status \u00E4r nu satt till synlig p\u00E5 alla sajter. Andra kan se ditt namn i Roster/deltagarlista och kan kontakta dig genom sajten.
 privacy_show_title=S\u00E4tt till synlig p\u00E5 alla sajter
diff --git a/usermembership/tool/src/webapp/index.html b/usermembership/tool/src/webapp/index.html
index ac5855db6f82..dbe419f0a5d0 100644
--- a/usermembership/tool/src/webapp/index.html
+++ b/usermembership/tool/src/webapp/index.html
@@ -8,6 +8,6 @@
 </head>
 <body>
  <h1>Admin User Membership Tool</h1>
- <p>Access the tool through My Workspace.</p>
+ <p>Access the tool through Home.</p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/web/web-portlet/src/bundle/iframe.properties b/web/web-portlet/src/bundle/iframe.properties
index 8cea8aaad8d1..627400462b8b 100644
--- a/web/web-portlet/src/bundle/iframe.properties
+++ b/web/web-portlet/src/bundle/iframe.properties
@@ -4,7 +4,7 @@ gen.custom = Customize Web Content
 gen.custom.site = Customize Server Info Display
 gen.custom.worksite = Customize Site Info Display
 gen.custom.annotatedurl = Customize Instruction Info Display
-gen.custom.workspace = Customize My Workspace Info Display
+gen.custom.workspace = Customize Home Info Display
 gen.height = Frame Height
 gen.title = Title
 gen.fa_icon = Choose a custom icon 
@@ -42,7 +42,7 @@ gen.info.pop = Open in new window?
 ### (moot) gen.info.no = no
 
 java.alert.pleentval = The height you entered is not valid.
-gen.info.title.message = My Workspace Information Message
+gen.info.title.message = Home Information Message
 gen.info.maximize = Launch Maximum Width
 
 gen.trouble.loading = This page seems to have trouble loading.
diff --git a/web/web-portlet/src/bundle/iframe_en_GB.properties b/web/web-portlet/src/bundle/iframe_en_GB.properties
index ec99afb87645..6182283ca7af 100644
--- a/web/web-portlet/src/bundle/iframe_en_GB.properties
+++ b/web/web-portlet/src/bundle/iframe_en_GB.properties
@@ -1,5 +1,5 @@
 #Fri Nov 26 20:32:02 CET 2010
-gen.custom.workspace=Customise My Workspace Info Display
+gen.custom.workspace=Customise Home Info Display
 gen.custom=Customise Web Content
 gen.custom.site=Customise Server Info Display
 gen.custom.worksite=Customise Site Info Display
diff --git a/web/web-portlet/src/bundle/iframe_vi.properties b/web/web-portlet/src/bundle/iframe_vi.properties
index d567c98f0161..d2d76d70ac84 100644
--- a/web/web-portlet/src/bundle/iframe_vi.properties
+++ b/web/web-portlet/src/bundle/iframe_vi.properties
@@ -7,7 +7,7 @@ gen.height=Chi\u1EC1u cao khung
 gen.tootit=Ti\u00EAu \u0111\u1EC1 C\u00F4ng c\u1EE5 
 gen.heisomelse=C\u00E1i g\u00EC kh\u00E1c 
 gen.custom.worksite=Tu\u1EF3 ch\u1EC9nh trang web th\u00F4ng tin 
-gen.custom.workspace=T\u00F9y ch\u1EC9nh My Workspace  
+gen.custom.workspace=T\u00F9y ch\u1EC9nh Home  
 gen.pixels=pixels 
 gen.custheight=Tu\u1EF3 ch\u1EC9nh chi\u1EC1u cao 
 gen.info.url=Th\u00F4ng tin trang web URL 
diff --git a/web/web-portlet/src/webapp/WEB-INF/sakai/PortletIFrame.xml b/web/web-portlet/src/webapp/WEB-INF/sakai/PortletIFrame.xml
index 9c8d8e00664a..ab062f883a22 100644
--- a/web/web-portlet/src/webapp/WEB-INF/sakai/PortletIFrame.xml
+++ b/web/web-portlet/src/webapp/WEB-INF/sakai/PortletIFrame.xml
@@ -54,8 +54,8 @@
 
 	<tool
 			id="sakai.iframe.myworkspace"
-			title="My Workspace Information Display"
-			description="For displaying information about a user's My Workspace.">
+			title="Home Information Display"
+			description="For displaying information about a user's Home.">
 
 		<configuration name="height" value="600px" />
 
diff --git a/web/web-tool/tool/src/bundle/iframe.properties b/web/web-tool/tool/src/bundle/iframe.properties
index af3deeabceba..819ffe52728f 100644
--- a/web/web-tool/tool/src/bundle/iframe.properties
+++ b/web/web-tool/tool/src/bundle/iframe.properties
@@ -4,7 +4,7 @@ gen.custom = Customize Web Content
 gen.custom.site = Customize Server Info Display
 gen.custom.worksite = Customize Site Info Display
 gen.custom.annotatedurl = Customize Instruction Info Display
-gen.custom.workspace = Customize My Workspace Info Display
+gen.custom.workspace = Customize Home Info Display
 gen.height = Frame Height
 gen.title = Title
 gen.tootit = Tool Title
@@ -41,7 +41,7 @@ gen.info.pop = Open in new window?
 ### (moot) gen.info.no = no
 
 java.alert.pleentval = The height you entered is not valid.
-gen.info.title.message = My Workspace Information Message
+gen.info.title.message = Home Information Message
 
 gen.trouble.loading=Page launched in a new window.
 new.page.relaunch=Re-launch page in a new window.
diff --git a/web/web-tool/tool/src/bundle/iframe_en_GB.properties b/web/web-tool/tool/src/bundle/iframe_en_GB.properties
index 98a0296acb28..260b909536f5 100644
--- a/web/web-tool/tool/src/bundle/iframe_en_GB.properties
+++ b/web/web-tool/tool/src/bundle/iframe_en_GB.properties
@@ -1,5 +1,5 @@
 #Fri Nov 26 20:32:02 CET 2010
-gen.custom.workspace=Customise My Workspace Info Display
+gen.custom.workspace=Customise Home Info Display
 gen.custom=Customise Web Content
 gen.custom.site=Customise Server Info Display
 gen.custom.worksite=Customise Site Info Display
diff --git a/web/web-tool/tool/src/bundle/iframe_vi.properties b/web/web-tool/tool/src/bundle/iframe_vi.properties
index d567c98f0161..d2d76d70ac84 100644
--- a/web/web-tool/tool/src/bundle/iframe_vi.properties
+++ b/web/web-tool/tool/src/bundle/iframe_vi.properties
@@ -7,7 +7,7 @@ gen.height=Chi\u1EC1u cao khung
 gen.tootit=Ti\u00EAu \u0111\u1EC1 C\u00F4ng c\u1EE5 
 gen.heisomelse=C\u00E1i g\u00EC kh\u00E1c 
 gen.custom.worksite=Tu\u1EF3 ch\u1EC9nh trang web th\u00F4ng tin 
-gen.custom.workspace=T\u00F9y ch\u1EC9nh My Workspace  
+gen.custom.workspace=T\u00F9y ch\u1EC9nh Home  
 gen.pixels=pixels 
 gen.custheight=Tu\u1EF3 ch\u1EC9nh chi\u1EC1u cao 
 gen.info.url=Th\u00F4ng tin trang web URL