diff --git a/data/org.gnome.Shell.Extensions.GSConnect.gschema.xml b/data/org.gnome.Shell.Extensions.GSConnect.gschema.xml
index ffdb925f1..f1a47caea 100644
--- a/data/org.gnome.Shell.Extensions.GSConnect.gschema.xml
+++ b/data/org.gnome.Shell.Extensions.GSConnect.gschema.xml
@@ -192,7 +192,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <key name="talking-pause" type="b">
       <default>true</default>
     </key>
-    <key name="after-unpause" type="b">
+    <key name="ended-resume" type="b">
       <default>true</default>
     </key>
   </schema>
diff --git a/data/ui/preferences-device-panel.ui b/data/ui/preferences-device-panel.ui
index 4bdabff5b..8e4563443 100644
--- a/data/ui/preferences-device-panel.ui
+++ b/data/ui/preferences-device-panel.ui
@@ -1772,12 +1772,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="after-list-label">
+                      <object class="GtkLabel" id="ended-list-label">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
                         <property name="margin-bottom">12</property>
-                        <property name="label" translatable="yes">After Calls</property>
+                        <property name="label" translatable="yes">Call Ended</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1794,7 +1794,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                         <property name="can-focus">False</property>
                         <property name="label-xalign">0</property>
                         <child>
-                          <object class="GtkListBox" id="after-list">
+                          <object class="GtkListBox" id="ended-list">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="hexpand">True</property>
@@ -1802,7 +1802,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                             <signal name="keynav-failed" handler="_onKeynavFailed" swapped="no"/>
                             <signal name="row-activated" handler="_onToggleRowActivated" swapped="no"/>
                             <child>
-                              <object class="GtkListBoxRow" id="after-unpause-row">
+                              <object class="GtkListBoxRow" id="ended-resume-row">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <property name="height-request">56</property>
@@ -1815,7 +1815,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                                     <property name="margin-end">12</property>
                                     <property name="column-spacing">12</property>
                                     <child>
-                                      <object class="GtkLabel" id="after-unpause-label">
+                                      <object class="GtkLabel" id="ended-resume-label">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
                                         <property name="halign">start</property>
@@ -1824,8 +1824,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
                                         <property name="vexpand">True</property>
                                         <property name="label" translatable="yes">Resume Paused Media</property>
                                         <accessibility>
-                                          <relation type="label-for" target="after-unpause-row"/>
-                                          <relation type="label-for" target="after-unpause"/>
+                                          <relation type="label-for" target="ended-resume-row"/>
+                                          <relation type="label-for" target="ended-resume"/>
                                         </accessibility>
                                       </object>
                                       <packing>
@@ -1834,14 +1834,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkSwitch" id="after-unpause">
+                                      <object class="GtkSwitch" id="ended-resume">
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="valign">center</property>
-                                        <property name="action-name">settings.after-unpause</property>
+                                        <property name="action-name">settings.ended-resume</property>
                                         <accessibility>
-                                          <relation type="controlled-by" target="after-unpause-row"/>
-                                          <relation type="labelled-by" target="after-unpause-label"/>
+                                          <relation type="controlled-by" target="ended-resume-row"/>
+                                          <relation type="labelled-by" target="ended-resume-label"/>
                                         </accessibility>
                                       </object>
                                       <packing>
diff --git a/src/preferences/device.js b/src/preferences/device.js
index cb6bca09e..aa65fe28a 100644
--- a/src/preferences/device.js
+++ b/src/preferences/device.js
@@ -286,7 +286,7 @@ var Panel = GObject.registerClass({
         // Telephony
         'telephony', 'telephony-page',
         'ringing-list', 'ringing-volume', 'talking-list', 'talking-volume',
-        'after-list',
+        'ended-list',
 
         // Shortcuts
         'shortcuts-page',
@@ -485,7 +485,7 @@ var Panel = GObject.registerClass({
         this.actions.add_action(settings.create_action('talking-volume'));
         this.actions.add_action(settings.create_action('talking-pause'));
         this.actions.add_action(settings.create_action('talking-microphone'));
-        this.actions.add_action(settings.create_action('after-unpause'));
+        this.actions.add_action(settings.create_action('ended-resume'));
 
         // Pair Actions
         const encryption_info = new Gio.SimpleAction({name: 'encryption-info'});
@@ -905,12 +905,12 @@ var Panel = GObject.registerClass({
         this.ringing_list.next = this.talking_list;
         this.talking_list.prev = this.ringing_list;
 
-        this.talking_list.next = this.after_list;
-        this.after_list.prev = this.talking_list;
+        this.talking_list.next = this.ended_list;
+        this.ended_list.prev = this.talking_list;
 
         this.ringing_list.set_header_func(rowSeparators);
         this.talking_list.set_header_func(rowSeparators);
-        this.after_list.set_header_func(rowSeparators);
+        this.ended_list.set_header_func(rowSeparators);
     }
 
     /**
diff --git a/src/service/plugins/telephony.js b/src/service/plugins/telephony.js
index c2433094f..cffc40187 100644
--- a/src/service/plugins/telephony.js
+++ b/src/service/plugins/telephony.js
@@ -99,7 +99,7 @@ var Plugin = GObject.registerClass({
      * Restore volume and microphone, plus media player state
      * (if we changed it and restore is enabled).
      *
-     * If we're going to auto-unpause, make sure to do that first
+     * If we're going to auto-resume, make sure to do that first
      * before raising volume.
      * Otherwise, still raise the volume (so the user can unpause).
      *
@@ -109,10 +109,10 @@ var Plugin = GObject.registerClass({
     _restoreMediaState() {
         // Media Playback
         if (this._mpris) {
-            if (this.settings.get_boolean('after-unpause')) {
+            if (this.settings.get_boolean('ended-resume')) {
                 this._mpris.unpauseAll();
             } else {
-                /* Even if unpause is disabled, we still need to clear
+                /* Even if resume is disabled, we still need to clear
                  * the list of which players we're holding paused
                  *
                  * TODO: This potentially worsens the multi-device