diff --git a/changelog.d/6193.misc b/changelog.d/6193.misc
new file mode 100644
index 000000000..8e3707f8f
--- /dev/null
+++ b/changelog.d/6193.misc
@@ -0,0 +1 @@
+Make storage layer responsible for adding device names to key, rather than the handler.