diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/ipsec.d/data.sql
index f5d06eabaa..4f181b91bc 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/ipsec.d/data.sql
@@ -14,13 +14,13 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of carol@strongswan.org */
+) VALUES ( /* subjkey of carol@strongswan.org */
   11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/ipsec.d/data.sql
index 2e9acf5f62..9a36c2c377 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/ipsec.d/data.sql
@@ -14,13 +14,13 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of dave@strongswan.org */
+) VALUES ( /* subjkey of dave@strongswan.org */
   11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/ipsec.d/data.sql
index ee75869251..9718a75bff 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/ipsec.d/data.sql
@@ -26,19 +26,19 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of carol@strongswan.org */
+) VALUES ( /* subjkey of carol@strongswan.org */
   11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of dave@strongswan.org */
+) VALUES ( /* subjkey of dave@strongswan.org */
   11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
  );
 
diff --git a/testing/tests/sql/rw-rsa/hosts/carol/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa/hosts/carol/etc/ipsec.d/data.sql
index bf086ad425..8219bdfada 100644
--- a/testing/tests/sql/rw-rsa/hosts/carol/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa/hosts/carol/etc/ipsec.d/data.sql
@@ -14,13 +14,13 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of carol@strongswan.org */
+) VALUES ( /* subjkey of carol@strongswan.org */
   11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
diff --git a/testing/tests/sql/rw-rsa/hosts/dave/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa/hosts/dave/etc/ipsec.d/data.sql
index cbd2ae2e00..7c9cd9fe4b 100644
--- a/testing/tests/sql/rw-rsa/hosts/dave/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa/hosts/dave/etc/ipsec.d/data.sql
@@ -14,13 +14,13 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of dave@strongswan.org */
+) VALUES ( /* subjkey of dave@strongswan.org */
   11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
diff --git a/testing/tests/sql/rw-rsa/hosts/moon/etc/ipsec.d/data.sql b/testing/tests/sql/rw-rsa/hosts/moon/etc/ipsec.d/data.sql
index 545708e677..8a4eb2d212 100644
--- a/testing/tests/sql/rw-rsa/hosts/moon/etc/ipsec.d/data.sql
+++ b/testing/tests/sql/rw-rsa/hosts/moon/etc/ipsec.d/data.sql
@@ -26,19 +26,19 @@ INSERT INTO identities (
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of moon.strongswan.org */
+) VALUES ( /* subjkey of moon.strongswan.org */
   11, X'6a9c74d1f8897989f65a94e989f1fac3649d292e'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of carol@strongswan.org */
+) VALUES ( /* subjkey of carol@strongswan.org */
   11, X'1fa1a988d9648cb5a0a2546439b4f23d745d6e7c'
  );
 
 INSERT INTO identities (
   type, data
-) VALUES ( /* keyid of dave@strongswan.org */
+) VALUES ( /* subjkey of dave@strongswan.org */
   11, X'ee7f38daeea1b81a41777f78f2674be8439d8e0e'
  );