diff --git a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
index 8c907d99020..e1a5f9a706b 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
@@ -287,7 +287,7 @@ public class RegExpExtractor {
     public void visit(UnicodePropertyEscape nd) {
       Label lbl = extractTerm(nd, parent, idx);
       trapwriter.addTuple("unicode_property_escapename", lbl, nd.getName());
-      if (nd.hasValue()) trapwriter.addTuple("unicodePropertyEscapeValue", lbl, nd.getValue());
+      if (nd.hasValue()) trapwriter.addTuple("unicode_property_escapevalue", lbl, nd.getValue());
     }
 
     @Override
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
index e55fd07fbdd..44cccd78fec 100644
--- a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -249,7 +249,7 @@ regexpterm(#20079,27,#20078,0,"\P{Script=Greek}")
 locations_default(#20080,#10000,5,2,5,17)
 hasLocation(#20079,#20080)
 unicode_property_escapename(#20079,"Script")
-unicodePropertyEscapeValue(#20079,"Greek")
+unicode_property_escapevalue(#20079,"Greek")
 #20081=*
 stmts(#20081,2,#20001,5,"/\k</;")
 hasLocation(#20081,#20013)
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
index e152edba50b..a2fa4ad83bf 100644
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -275,3 +275,8 @@ deprecated predicate namedBackref(RegExpBackRef id, string name) { named_backref
  * Use `RegExpUnicodePropertyEscape#getName()` instead.
  */ 
 deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) { unicode_property_escapename(id, name) }
+/**
+ * Alias for the predicate `unicode_property_escapevalue` defined in the .dbscheme.
+ * Use `RegExpUnicodePropertyEscape#getValue()` instead.
+ */ 
+deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id, string value) { unicode_property_escapevalue(id, value) }
diff --git a/javascript/ql/src/semmle/javascript/Regexp.qll b/javascript/ql/src/semmle/javascript/Regexp.qll
index 546f8299bd0..485848f40c4 100644
--- a/javascript/ql/src/semmle/javascript/Regexp.qll
+++ b/javascript/ql/src/semmle/javascript/Regexp.qll
@@ -707,7 +707,7 @@ class RegExpUnicodePropertyEscape extends RegExpEscape, @regexp_unicode_property
    * For example, the value of Unicode property `\p{Script=Greek}` is `Greek`, while
    * `\p{Number}` does not have a value.
    */
-  string getValue() { unicodePropertyEscapeValue(this, result) }
+  string getValue() { unicode_property_escapevalue(this, result) }
 
   override predicate isNullable() { none() }
 }
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 1ad084f6d27..beaea81876f 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -888,7 +888,7 @@ char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) valu
 backref (unique int id: @regexp_backref ref, int value: int ref);
 named_backref (unique int id: @regexp_backref ref, string name: string ref);
 unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
-unicodePropertyEscapeValue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
 
 // tokens
 #keyset[toplevel, idx]
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
index 572b146c945..fb56f14c8f4 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -20691,7 +20691,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>unicodePropertyEscapeValue</name>
+<name>unicode_property_escapevalue</name>
 <cardinality>1573</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
index 20f10aba310..44d615bd845 100644
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -84,3 +84,5 @@ named_backref.rel: reorder namedBackref.rel(int id, string name) id name
 namedBackref.rel: delete
 unicode_property_escapename.rel: reorder unicodePropertyEscapeName.rel(int id, string name) id name
 unicodePropertyEscapeName.rel: delete
+unicode_property_escapevalue.rel: reorder unicodePropertyEscapeValue.rel(int id, string value) id value
+unicodePropertyEscapeValue.rel: delete