diff --git a/README.md b/README.md
index a1b8e71..220ef8f 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Moodle Plugins for Microsoft Services
-*including* **Office 365** *and other Microsoft services*
+*including* **Microsoft 365** *and other Microsoft services*
 
 ## Microsoft block
 
-This plugin provides easy access to all Microsoft Account and Office 365 services for Moodle.
+This plugin provides easy access to all Microsoft Account and Microsoft 365 services for Moodle.
 
-This is part of the suite of Office 365 plugins for Moodle.
+This is part of the suite of Microsoft 365 plugins for Moodle.
 
 This repository is updated with stable releases. To follow active development, see: https://github.com/Microsoft/o365-moodle
 
diff --git a/block_microsoft.php b/block_microsoft.php
index fc998d3..5934ccd 100644
--- a/block_microsoft.php
+++ b/block_microsoft.php
@@ -309,7 +309,7 @@ class block_microsoft extends block_base {
             }
         }
 
-        // Download Office 365.
+        // Download Microsoft 365.
         $downloadlinks = $this->get_content_o365download();
         foreach ($downloadlinks as $link) {
             $items[] = $link;
@@ -353,7 +353,7 @@ class block_microsoft extends block_base {
     }
 
     /**
-     * Get Office 365 download links (if enabled).
+     * Get Microsoft 365 download links (if enabled).
      *
      * @return array Array of download link HTML, or empty array if download links disabled.
      */
diff --git a/lang/en/block_microsoft.php b/lang/en/block_microsoft.php
index 110155e..b06e8dd 100644
--- a/lang/en/block_microsoft.php
+++ b/lang/en/block_microsoft.php
@@ -36,7 +36,7 @@ $string['linkcoursegroup'] = 'Course Group';
 $string['linksharepoint'] = 'Course SharePoint site';
 $string['linkoutlook'] = 'Outlook Calendar sync settings';
 $string['linkprefs'] = 'Edit settings';
-$string['linkconnection'] = 'Office 365 connection settings';
+$string['linkconnection'] = 'Microsoft 365 connection settings';
 $string['microsoft'] = 'Microsoft';
 $string['microsoft:addinstance'] = 'Add a new Microsoft block';
 $string['microsoft:myaddinstance'] = 'Add a New Microsoft block to the My Moodle page';
@@ -45,17 +45,17 @@ $string['microsoft:managegroups'] = 'Allow the ablity to manage groups';
 $string['notebookname'] = 'Moodle Notebook';
 $string['opennotebook'] = 'Open your notebook';
 $string['workonthis'] = 'Work on this';
-$string['o365matched_title'] = 'You are <span style="color: #960">almost</span> connected to Office&nbsp;365';
-$string['o365matched_desc'] = 'You have been matched with the Office&nbsp;365 user <b>"{$a}"</b>';
-$string['o365matched_complete_userpass'] = 'To complete the connection, please enter the password for this Office&nbsp;365 user and click "Connect"';
-$string['o365matched_complete_authreq'] = 'To complete the connection, please click the link below and log in to this Office&nbsp;365 account.';
-$string['o365connected'] = '{$a->firstname} you are currently <span class="notifysuccess">connected</span> to Office&nbsp;365';
+$string['o365matched_title'] = 'You are <span style="color: #960">almost</span> connected to Microsoft 365';
+$string['o365matched_desc'] = 'You have been matched with the Microsoft 365 user <b>"{$a}"</b>';
+$string['o365matched_complete_userpass'] = 'To complete the connection, please enter the password for this Microsoft 365 user and click "Connect"';
+$string['o365matched_complete_authreq'] = 'To complete the connection, please click the link below and log in to this Microsoft 365 account.';
+$string['o365connected'] = '{$a->firstname} you are currently <span class="notifysuccess">connected</span> to Microsoft 365';
 $string['notconnected'] = 'You are <span class="notifyproblem">not connected</span> to any Microsoft services.';
 $string['cachedef_onenotenotebook'] = 'Stores OneNote notebook.';
-$string['cachedef_groups'] = 'Caches Office 365 group information.';
+$string['cachedef_groups'] = 'Caches Microsoft 365 group information.';
 $string['msalogin'] = 'Log in with Microsoft Account';
-$string['logintoo365'] = 'Log in to Office&nbsp;365';
-$string['connecttoo365'] = 'Connect to Office 365';
+$string['logintoo365'] = 'Log in to Microsoft 365';
+$string['connecttoo365'] = 'Connect to Microsoft 365';
 $string['geto365'] = 'Install Office';
 $string['settings_showemail'] = 'Show "My Email"';
 $string['settings_showemail_desc'] = 'Enable or disable the "My Email" link in the block.';
@@ -82,14 +82,14 @@ $string['settings_showoutlooksync'] = 'Show "Outlook Calendar sync settings"';
 $string['settings_showoutlooksync_desc'] = 'Enable or disable the "Outlook Calendar sync settings" link in the block.';
 $string['settings_showpreferences'] = 'Show "Edit Settings"';
 $string['settings_showpreferences_desc'] = 'Enable or disable the "Edit Settings" link in the block.';
-$string['settings_showo365connect'] = 'Show "Connect to Office 365"';
-$string['settings_showo365connect_desc'] = 'Enable or disable the "Connect to Office 365" link in the block. <br /><b>Note:</b> This is shown to users who are not connected to Office 365 and takes them to the page that allows them to set up a connection.';
-$string['settings_showmanageo365conection'] = 'Show "Office 365 connection settings"';
-$string['settings_showmanageo365conection_desc'] = 'Enable or disable the "Office 365 connection settings" link in the block. <br /><b>Note:</b> This is shown to Office 365 connected users and takes them to connection management page.';
+$string['settings_showo365connect'] = 'Show "Connect to Microsoft 365"';
+$string['settings_showo365connect_desc'] = 'Enable or disable the "Connect to Microsoft 365" link in the block. <br /><b>Note:</b> This is shown to users who are not connected to Microsoft 365 and takes them to the page that allows them to set up a connection.';
+$string['settings_showmanageo365conection'] = 'Show "Microsoft 365 connection settings"';
+$string['settings_showmanageo365conection_desc'] = 'Enable or disable the "Microsoft 365 connection settings" link in the block. <br /><b>Note:</b> This is shown to Microsoft 365 connected users and takes them to connection management page.';
 $string['settings_showcoursespsite'] = 'Show "Course SharePoint site"';
 $string['settings_showcoursespsite_desc'] = 'Enable or disable the "Course SharePoint site" link in the block. <br /><b>Note:</b> This is shown in the block when viewing a course that has an associated SharePoint site.';
 $string['settings_showcoursegroup'] = 'Show "Course Group"';
-$string['settings_showcoursegroup_desc'] = 'Enable or disable the "Course Group" link in the block. <br /><b>Note:</b> This is shown when viewing a course that has an associated Office 365 group.';
+$string['settings_showcoursegroup_desc'] = 'Enable or disable the "Course Group" link in the block. <br /><b>Note:</b> This is shown when viewing a course that has an associated Microsoft 365 group.';
 $string['defaultprofile'] = 'Profile image';
 $string['groupsnotenabledforcourse'] = 'Office Groups are not enabled for this course.';
 $string['settings_geto365link'] = 'Install Office download URL';
diff --git a/settings.php b/settings.php
index bac6006..63fbd18 100644
--- a/settings.php
+++ b/settings.php
@@ -75,12 +75,12 @@ $label = new lang_string('settings_showpreferences', 'block_microsoft');
 $desc = new lang_string('settings_showpreferences_desc', 'block_microsoft');
 $settings->add(new \admin_setting_configcheckbox('block_microsoft/settings_showpreferences', $label, $desc, 1));
 
-// Settings to show Office 365 Connect link in the block.
+// Settings to show Microsoft 365 Connect link in the block.
 $label = new lang_string('settings_showo365connect', 'block_microsoft');
 $desc = new lang_string('settings_showo365connect_desc', 'block_microsoft');
 $settings->add(new \admin_setting_configcheckbox('block_microsoft/settings_showo365connect', $label, $desc, 1));
 
-// Settings to show Office 365 connection settings link in the block.
+// Settings to show Microsoft 365 connection settings link in the block.
 $label = new lang_string('settings_showmanageo365conection', 'block_microsoft');
 $desc = new lang_string('settings_showmanageo365conection_desc', 'block_microsoft');
 $settings->add(new \admin_setting_configcheckbox('block_microsoft/settings_showmanageo365conection', $label, $desc, 0));
@@ -90,12 +90,12 @@ $label = new lang_string('settings_showcoursespsite', 'block_microsoft');
 $desc = new lang_string('settings_showcoursespsite_desc', 'block_microsoft');
 $settings->add(new \admin_setting_configcheckbox('block_microsoft/settings_showcoursespsite', $label, $desc, 1));
 
-// Settings to show Office 365 download links in block.
+// Settings to show Microsoft 365 download links in block.
 $label = new lang_string('settings_showo365download', 'block_microsoft');
 $desc = new lang_string('settings_showo365download_desc', 'block_microsoft');
 $settings->add(new \admin_setting_configcheckbox('block_microsoft/showo365download', $label, $desc, 1));
 
-// Settings to customize "Get Office 365" URL.
+// Settings to customize "Get Microsoft 365" URL.
 $label = new lang_string('settings_geto365link', 'block_microsoft');
 $desc = new lang_string('settings_geto365link_desc', 'block_microsoft');
 $default = new lang_string('settings_geto365link_default', 'block_microsoft');