diff --git a/kanji/05f9e.svg b/kanji/05f9e.svg
index ad2b25f92..c8f2f629c 100644
--- a/kanji/05f9e.svg
+++ b/kanji/05f9e.svg
@@ -44,7 +44,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:05f9e-s3" kvg:type="㇑" d="M28.72,53c0.36,0.25,1.07,1.65,1.15,2.16c0.07,0.51,0,37.15-0.07,40.34"/>
 		</g>
 	</g>
-	<g id="kvg:05f9e-g3" kvg:element="CDP8BB0" kvg:position="right">
+	<g id="kvg:05f9e-g3" kvg:element="CDP-8BB0" kvg:position="right">
 		<g id="kvg:05f9e-g4" kvg:element="从" kvg:position="top">
 			<g id="kvg:05f9e-g5" kvg:element="人" kvg:position="left">
 				<path id="kvg:05f9e-s4" kvg:type="㇒" d="M57.61,16.99c0,0.6,0.03,1.08-0.08,1.8c-0.58,3.75-6.07,16.28-10.77,21.83"/>
diff --git a/kanji/0616b.svg b/kanji/0616b.svg
index 6fe2728e4..0c567e1be 100644
--- a/kanji/0616b.svg
+++ b/kanji/0616b.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:0616b-s3" kvg:type="㇑" d="M28.67,41.49c0.35,0.17,1.03,1.12,1.1,1.47c0.07,0.35,0,23.36-0.07,25.54"/>
 			</g>
 		</g>
-		<g id="kvg:0616b-g4" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:0616b-g4" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:0616b-g5" kvg:element="从" kvg:position="top">
 				<g id="kvg:0616b-g6" kvg:element="人" kvg:position="left">
 					<path id="kvg:0616b-s4" kvg:type="㇒" d="M54.45,11.42c0,0.56,0.03,1-0.1,1.67c-0.66,3.48-6.95,15.07-12.34,20.21"/>
diff --git a/kanji/06a05-Kaisho.svg b/kanji/06a05-Kaisho.svg
index 7c4cbe4b2..57564ff2f 100644
--- a/kanji/06a05-Kaisho.svg
+++ b/kanji/06a05-Kaisho.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:06a05-Kaisho-s7" kvg:type="㇑" d="M46.07,59c0.27,0.25,0.8,1.65,0.85,2.16c0.05,0.51,0,32.15-0.05,35.34"/>
 			</g>
 		</g>
-		<g id="kvg:06a05-Kaisho-g5" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:06a05-Kaisho-g5" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:06a05-Kaisho-g6" kvg:element="从" kvg:position="top">
 				<g id="kvg:06a05-Kaisho-g7" kvg:element="人" kvg:position="left">
 					<path id="kvg:06a05-Kaisho-s8" kvg:type="㇒" d="M70.05,12.99c0,0.54,0.02,0.98-0.08,1.63c-0.52,3.4-5.49,14.73-9.74,19.75"/>
diff --git a/kanji/06a05.svg b/kanji/06a05.svg
index 6dbdb7262..ae365ab98 100644
--- a/kanji/06a05.svg
+++ b/kanji/06a05.svg
@@ -51,7 +51,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:06a05-s7" kvg:type="㇑" d="M46.07,59c0.27,0.25,0.8,1.65,0.85,2.16c0.05,0.51,0,32.15-0.05,35.34"/>
 			</g>
 		</g>
-		<g id="kvg:06a05-g5" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:06a05-g5" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:06a05-g6" kvg:element="从" kvg:position="top">
 				<g id="kvg:06a05-g7" kvg:element="人" kvg:position="left">
 					<path id="kvg:06a05-s8" kvg:type="㇒" d="M70.05,12.99c0,0.54,0.02,0.98-0.08,1.63c-0.52,3.4-5.49,14.73-9.74,19.75"/>
diff --git a/kanji/07e31-Kaisho.svg b/kanji/07e31-Kaisho.svg
index b43219d82..5b85df449 100644
--- a/kanji/07e31-Kaisho.svg
+++ b/kanji/07e31-Kaisho.svg
@@ -53,7 +53,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:07e31-Kaisho-s9" kvg:type="㇑" d="M51.51,52.75c0.18,0.26,0.53,1.69,0.56,2.21c0.03,0.52,0,38.03-0.04,41.29"/>
 			</g>
 		</g>
-		<g id="kvg:07e31-Kaisho-g5" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:07e31-Kaisho-g5" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:07e31-Kaisho-g6" kvg:element="从" kvg:position="top">
 				<g id="kvg:07e31-Kaisho-g7" kvg:element="人" kvg:position="left">
 					<path id="kvg:07e31-Kaisho-s10" kvg:type="㇒" d="M71.33,14.74c0,0.61,0.02,1.09-0.07,1.82c-0.47,3.79-4.93,16.45-8.75,22.06"/>
diff --git a/kanji/07e31.svg b/kanji/07e31.svg
index fe220a630..0bd45176c 100644
--- a/kanji/07e31.svg
+++ b/kanji/07e31.svg
@@ -53,7 +53,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:07e31-s9" kvg:type="㇑" d="M51.51,52.75c0.18,0.26,0.53,1.69,0.56,2.21c0.03,0.52,0,38.03-0.04,41.29"/>
 			</g>
 		</g>
-		<g id="kvg:07e31-g5" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:07e31-g5" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:07e31-g6" kvg:element="从" kvg:position="top">
 				<g id="kvg:07e31-g7" kvg:element="人" kvg:position="left">
 					<path id="kvg:07e31-s10" kvg:type="㇒" d="M71.33,14.74c0,0.61,0.02,1.09-0.07,1.82c-0.47,3.79-4.93,16.45-8.75,22.06"/>
diff --git a/kanji/08073-Kaisho.svg b/kanji/08073-Kaisho.svg
index 31a09327b..0c7420b22 100644
--- a/kanji/08073-Kaisho.svg
+++ b/kanji/08073-Kaisho.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:08073-Kaisho-s3" kvg:type="㇑" d="M28.47,36.86c0.36,0.16,1.07,1.06,1.15,1.39c0.07,0.33,0,17.94-0.07,20"/>
 			</g>
 		</g>
-		<g id="kvg:08073-Kaisho-g4" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:08073-Kaisho-g4" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:08073-Kaisho-g5" kvg:element="从" kvg:position="top">
 				<g id="kvg:08073-Kaisho-g6" kvg:element="人" kvg:position="left">
 					<path id="kvg:08073-Kaisho-s4" kvg:type="㇒" d="M53.86,8.66c0,0.49,0.03,0.88-0.09,1.47c-0.63,3.05-6.63,13.24-11.76,17.77"/>
diff --git a/kanji/08073-KaishoVt3.svg b/kanji/08073-KaishoVt3.svg
index 6d2bc36b8..108f01972 100644
--- a/kanji/08073-KaishoVt3.svg
+++ b/kanji/08073-KaishoVt3.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:08073-KaishoVt3-s3" kvg:type="㇑" d="M28.47,36.86c0.36,0.16,1.07,1.06,1.15,1.39c0.07,0.33,0,17.94-0.07,20"/>
 			</g>
 		</g>
-		<g id="kvg:08073-KaishoVt3-g4" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:08073-KaishoVt3-g4" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:08073-KaishoVt3-g5" kvg:element="从" kvg:position="top">
 				<g id="kvg:08073-KaishoVt3-g6" kvg:element="人" kvg:position="left">
 					<path id="kvg:08073-KaishoVt3-s4" kvg:type="㇒" d="M53.86,8.66c0,0.49,0.03,0.88-0.09,1.47c-0.63,3.05-6.63,13.24-11.76,17.77"/>
diff --git a/kanji/08073.svg b/kanji/08073.svg
index 51dee2830..de5abb630 100644
--- a/kanji/08073.svg
+++ b/kanji/08073.svg
@@ -45,7 +45,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:08073-s3" kvg:type="㇑" d="M28.47,36.86c0.36,0.16,1.07,1.06,1.15,1.39c0.07,0.33,0,17.94-0.07,20"/>
 			</g>
 		</g>
-		<g id="kvg:08073-g4" kvg:element="CDP8BB0" kvg:position="right">
+		<g id="kvg:08073-g4" kvg:element="CDP-8BB0" kvg:position="right">
 			<g id="kvg:08073-g5" kvg:element="从" kvg:position="top">
 				<g id="kvg:08073-g6" kvg:element="人" kvg:position="left">
 					<path id="kvg:08073-s4" kvg:type="㇒" d="M53.86,8.66c0,0.49,0.03,0.88-0.09,1.47c-0.63,3.05-6.63,13.24-11.76,17.77"/>