diff --git a/NEWS b/NEWS
index fb3c0003290..14b189c1a11 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ PHP                                                                        NEWS
 
 - MySQLi:
   . Fixed bug #70372 (Emulate mysqli_fetch_all() for libmysqlclient). (Nikita)
+  . Fixed bug #80330 (Replace language in APIs and source code/docs).
+    (Darek Ślusarczyk)
 
 - OpenSSL:
   . Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka)
diff --git a/UPGRADING b/UPGRADING
index 4c9a1536df9..facdf303773 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -187,6 +187,12 @@ PHP 8.1 UPGRADE NOTES
 10. New Global Constants
 ========================================
 
+- MySQLi:
+  . MYSQLI_REFRESH_REPLICA has been added as a replacement for
+    MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
+    constant is still available for backwards-compatibility reasons, but may
+    be deprecated/removed in the future.
+
 ========================================
 11. Changes to INI File Handling
 ========================================
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c2505478807..a007bc0e332 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -805,6 +805,8 @@ PHP_MINIT_FUNCTION(mysqli)
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_HOSTS",      REFRESH_HOSTS, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_STATUS",     REFRESH_STATUS, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_THREADS",    REFRESH_THREADS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_REPLICA",    REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
+	/* temporarily for backward compatibility */
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_SLAVE",      REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_MASTER",     REFRESH_MASTER, CONST_CS | CONST_PERSISTENT);
 #ifdef REFRESH_BACKUP_LOG
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 22e3cd9d2ba..6297d56b340 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -93,6 +93,7 @@ mysqli.allow_local_infile=1
         "MYSQLI_REFRESH_HOSTS"				=> true,
         "MYSQLI_REFRESH_STATUS"				=> true,
         "MYSQLI_REFRESH_THREADS"			=> true,
+        "MYSQLI_REFRESH_REPLICA"			=> true,
         "MYSQLI_REFRESH_SLAVE"				=> true,
         "MYSQLI_REFRESH_MASTER"				=> true,
         "MYSQLI_DEBUG_TRACE_ENABLED"		=> true,
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 6d6cefbb466..b65e8523b2a 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -681,7 +681,8 @@ enum php_mysqlnd_server_command
 #define MYSQLND_REFRESH_HOSTS		8	/* Flush host cache */
 #define MYSQLND_REFRESH_STATUS		16	/* Flush status variables */
 #define MYSQLND_REFRESH_THREADS		32	/* Flush thread cache */
-#define MYSQLND_REFRESH_SLAVE		64	/* Reset master info and restart slave */
+#define MYSQLND_REFRESH_REPLICA		64	/* Reset master info and restart replica */
+#define MYSQLND_REFRESH_SLAVE		MYSQLND_REFRESH_REPLICA	/* temporarily for backward compatibility */
 #define MYSQLND_REFRESH_MASTER		128	/* Remove all bin logs in the index */
 #define MYSQLND_REFRESH_BACKUP_LOG	0x200000L
 
diff --git a/ext/mysqlnd/mysqlnd_libmysql_compat.h b/ext/mysqlnd/mysqlnd_libmysql_compat.h
index 93d229281fd..8782a44350c 100644
--- a/ext/mysqlnd/mysqlnd_libmysql_compat.h
+++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h
@@ -125,6 +125,7 @@
 #define REFRESH_STATUS		MYSQLND_REFRESH_STATUS
 #define REFRESH_THREADS		MYSQLND_REFRESH_THREADS
 #define REFRESH_SLAVE		MYSQLND_REFRESH_SLAVE
+#define REFRESH_REPLICA		MYSQLND_REFRESH_REPLICA
 #define REFRESH_MASTER		MYSQLND_REFRESH_MASTER
 #define REFRESH_BACKUP_LOG	MYSQLND_REFRESH_BACKUP_LOG