diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 67fdb797..550dff3e 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -62,7 +62,7 @@ h2 { border-bottom-color: #2f2f2f; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
-.term-pitch-accent-expression-list,
+.term-pitch-accent-disambiguation-list,
 .kanji-glossary-list {
     color: #888888;
 }
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index be7a37a9..487b8cb8 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -62,7 +62,7 @@ h2 { border-bottom-color: #eeeeee; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
-.term-pitch-accent-expression-list,
+.term-pitch-accent-disambiguation-list,
 .kanji-glossary-list {
     color: #777777;
 }
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index c150b12e..c351a34c 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -489,23 +489,23 @@ button.action-button {
     margin-right: 0.375em;
 }
 
-.term-pitch-accent-expression-list {
+.term-pitch-accent-disambiguation-list {
     padding-right: 0.25em;
 }
 
-.term-pitch-accent-expression-list[data-count="0"] {
+.term-pitch-accent-disambiguation-list[data-count="0"] {
     display: none;
 }
 
-.term-pitch-accent-expression-list:before {
+.term-pitch-accent-disambiguation-list:before {
     content: "(";
 }
 
-.term-pitch-accent-expression-list:after {
+.term-pitch-accent-disambiguation-list:after {
     content: " only)";
 }
 
-.term-pitch-accent-expression+.term-pitch-accent-expression:before {
+.term-pitch-accent-disambiguation+.term-pitch-accent-disambiguation:before {
     content: ", ";
 }
 
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 09f173b4..b8d52d15 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -45,8 +45,8 @@
     </defs>
 </svg></template>
 <template id="term-pitch-accent-group-template"><li class="term-pitch-accent-group"><span class="term-pitch-accent-group-tag-list tag-list"></span><ul class="term-pitch-accent-list"></ul></li></template>
-<template id="term-pitch-accent-expression-template"><span class="term-pitch-accent-expression"></span></template>
-<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-expression-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span><span class="term-pitch-accent-details"><svg class="term-pitch-accent-graph" xmlns="http://www.w3.org/2000/svg"><path class="term-pitch-accent-graph-line" /><path class="term-pitch-accent-graph-line-tail" /></svg></span></li></template>
+<template id="term-pitch-accent-disambiguation-template"><span class="term-pitch-accent-disambiguation"></span></template>
+<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-disambiguation-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span><span class="term-pitch-accent-details"><svg class="term-pitch-accent-graph" xmlns="http://www.w3.org/2000/svg"><path class="term-pitch-accent-graph-line" /><path class="term-pitch-accent-graph-line-tail" /></svg></span></li></template>
 <template id="term-pitch-accent-character-template"><span class="term-pitch-accent-character"><span class="term-pitch-accent-character-inner"></span></span></template>
 
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 8177c31c..cdf96867 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -318,7 +318,7 @@ class DisplayGenerator {
         n = node.querySelector('.term-pitch-accent-tag-list');
         DisplayGenerator._appendMultiple(n, this.createTag.bind(this), tags);
 
-        n = node.querySelector('.term-pitch-accent-expression-list');
+        n = node.querySelector('.term-pitch-accent-disambiguation-list');
         DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), exclusiveExpressions);
 
         n = node.querySelector('.term-pitch-accent-characters');
@@ -346,7 +346,7 @@ class DisplayGenerator {
     }
 
     createPitchExpression(expression) {
-        const node = this._templateHandler.instantiate('term-pitch-accent-expression');
+        const node = this._templateHandler.instantiate('term-pitch-accent-disambiguation');
         node.textContent = expression;
         return node;
     }