diff --git a/changelog.d/17813.bugfix b/changelog.d/17813.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17813.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17813.misc b/changelog.d/17813.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17813.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17814.bugfix b/changelog.d/17814.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17814.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17814.misc b/changelog.d/17814.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17814.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17815.bugfix b/changelog.d/17815.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17815.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17815.misc b/changelog.d/17815.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17815.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17816.bugfix b/changelog.d/17816.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17816.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17816.misc b/changelog.d/17816.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17816.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17817.bugfix b/changelog.d/17817.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17817.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17817.misc b/changelog.d/17817.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17817.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17818.bugfix b/changelog.d/17818.bugfix
deleted file mode 100644
index 5dd276709b0..00000000000
--- a/changelog.d/17818.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Avoid lost data on some database query retries.
diff --git a/changelog.d/17818.misc b/changelog.d/17818.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17818.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.
diff --git a/changelog.d/17890.misc b/changelog.d/17890.misc
new file mode 100644
index 00000000000..f8676aee599
--- /dev/null
+++ b/changelog.d/17890.misc
@@ -0,0 +1 @@
+Refactor database calls to remove `Generator` usage.