- Use `ideo:same-as' instead of `:from.same'.

- Use `ideo:simplified-form-of' instead of `:from.simplified'.
- Use `ideo:vulgar-form-of' instead of `:from.vulgar'.
- Use `ideo:mistakable' instead of `:to.mistakable'.
- Use `ideo:ancient-form-of' instead of `:from.ancient'.

diff --git a/Ideograph-R032-Earth.ttl b/Ideograph-R032-Earth.ttl
index 7990e25..3a90988 100644 (file)
--- a/Ideograph-R032-Earth.ttl
+++ b/Ideograph-R032-Earth.ttl
@@ -774,17 +774,17 @@ a.ucs:0x5723
     :eq a.big5:0xC96F             ; # &I-B-C96F;
     :eq rep.daikanwa:04873        ; # &I-M-04873;
     :eq rep.jef-china3:0x47D2     ; # &I-JC3-47D2;
-    :from.same           [ :context domain:shuowen-yizheng ;
+    ideo:same-as         [ :context domain:shuowen-yizheng ;
                            :sources chisebib:shuowen-yizheng ,
                                     chisebib:daikanwa.:.04873...p1 ;
                            :target  rep.cns11643-3:0x402E ] ;
-    :from.same           [ :context domain:zhengzitong ;
+    ideo:same-as         [ :context domain:zhengzitong ;
                            :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa.:.04873...p1 ;
                            :target  rep.jis-x0212:0x4055 ] ;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.adobe-japan1-0:02655 ] ;
-    :from.vulgar         [ :sources chisebib:cihai ,
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.adobe-japan1-0:02655 ] ;
+    ideo:vulgar-form-of  [ :sources chisebib:cihai ,
                                     chisebib:daikanwa.:.04873...p2 ;
                            :target  rep.gt:37654         ] ;
     :subsume
@@ -1077,8 +1077,8 @@ a.ucs:0x5727
     :eq rep.gt-pj-1:12341         ; # &I-GT-06129;
     :eq rep.daikanwa...._.p:04879 ; # 圧
     :eq rep.shinjigen:1339        ; # 圧
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:04523 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:04523 ] ;
     :subsume
         g2.ucs_unicode:0x5727 ;
     .
@@ -2267,7 +2267,7 @@ a.ucs:0x21252
                          ] ;
     :eq rep.cns11643-6:0x2434     ; # &I-C6-2434;
     :eq rep.daikanwa:04898        ; # &I-M-04898;
-    :from.same           [ :sources chisebib:chuanpian ,
+    ideo:same-as         [ :sources chisebib:chuanpian ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:04923   ] ;
     .
@@ -2298,9 +2298,9 @@ a.ucs:0x2F851
     ideo:total-strokes     6 ;
     :eq rep.cns11643-6:0x2433     ; # &I-C6-2433;
     :eq rep.daikanwa:04899        ; # &I-M-04899;
-    :from.simplified     [ :context domain:misc    ;
-                           :sources chisebib:daikanwa ;
-                           :target  a.ucs:0x58EF         ] ;
+    ideo:simplified-form-of [ :context domain:misc    ;
+                              :sources chisebib:daikanwa ;
+                              :target  a.ucs:0x58EF         ] ;
     .
     rep.cns11643-6:0x2433
                :abstract-glyph-of     cns11643-6:0x2433  .
@@ -2571,7 +2571,7 @@ a.ucs:0x2124F
         ] ;
         :eq rep.cbeta:04395           ; # &CB04395;
         :eq rep.jef-china3:0x47E0     ; # &I-JC3-47E0;
-        :to.mistakable       a.ucs:0x572F         ;
+        ideo:mistakable      a.ucs:0x572F         ;
         .
         rep.cbeta:04395
                    :abstract-glyph-of          cbeta:04395   .
@@ -3723,7 +3723,7 @@ a.ucs:0x21259
                          ] ;
     :eq rep.cns11643-4:0x2360     ; # &I-C4-2360;
     :eq rep.daikanwa:04920        ; # &I-M-04920;
-    :from.ancient        [ :sources chisebib:jiyun ,
+    ideo:ancient-form-of [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.mj:009270        ,
                                     rep.daikanwa:05568   ] ;
@@ -3799,7 +3799,7 @@ rep.cns11643-3:0x252D
     ] ;
     :eq rep.ucs_cns:0x5748        ; # &C3-252D;
     :eq rep.daikanwa:04921        ; # &I-M-04921;
-    :from.same           [ :context domain:s.:.hole ;
+    ideo:same-as         [ :context domain:s.:.hole ;
                            :sources chisebib:chuci-buzhu ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5751         ] ;
@@ -5365,7 +5365,7 @@ rep.ucs_iso:0x21275
     :eq a.ucs_iwds-1:0x21275      ; # &C6-2661;
     :eq rep.cns11643-6:0x2661     ; # &C6-2661;
     :eq rep.daikanwa:04959        ; # &I-M-04959;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5146         ] ;
     :subsume
@@ -5635,7 +5635,7 @@ a.ucs:0x2125F
     ideo:total-strokes     7 ;
     :eq rep.cns11643-6:0x2669     ; # &I-C6-2669;
     :eq rep.daikanwa:04965        ; # &I-M-04965;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x58EF         ] ;
     :subsume
@@ -5697,9 +5697,9 @@ a.ucs:0x575B
     ideo:hanyu-dazidian  ( 1 421 9 ) ;
     :eq rep.gb2312:0x4C33         ; # &I-G0-4C33;
     :eq rep.hanziku-2:0xA6D3      ; # &I-HZK02-A6D3;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:009337        ] ;
-    :from.vulgar         a.ucs:0x58DC         ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:009337        ] ;
+    ideo:vulgar-form-of  a.ucs:0x58DC         ;
     .
     rep.gb2312:0x4C33
                :abstract-glyph-of         gb2312:0x4C33  .
@@ -6972,7 +6972,7 @@ rep.cns11643-3:0x2827
     ideo:strokes           5 ;
     ideo:total-strokes     8 ;
     :eq rep.daikanwa:04978        ; # &I-M-04978;
-    :from.ancient        [ :sources chisebib:zihui ,
+    ideo:ancient-form-of [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x574D         ] ;
     :subsume
@@ -7256,7 +7256,7 @@ a.ucs:0x576F
     :eq rep.daikanwa:04984        ; # &I-M-04984;
     :eq rep.shinjigen:1362        ; # 坯
     :eq rep.jef-china3:0x47EB     ; # &I-JC3-47EB;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x574F         ] ;
     .
     rep.adobe-japan1-5:17423
@@ -8841,7 +8841,7 @@ rep.ucs_iso:0x212A5
     rep.daikanwa:05027
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:05027 ;
-        :from.vulgar         [ :sources chisebib:zhonghua-dazidian ,
+        ideo:vulgar-form-of  [ :sources chisebib:zhonghua-dazidian ,
                                         chisebib:daikanwa ;
                                :target  a.ucs:0x5146         ] ;
         :subsume
@@ -8934,7 +8934,7 @@ a.ucs:0x3634
     :eq rep.daikanwa:05028        ; # &I-M-05028;
     :eq rep.shinjigen:1357        ; # 㘴
     :eq rep.jef-china3:0x47D4     ; # &I-JC3-47D4;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5750         ] ;
     .
     rep.cns11643-3:0x282C
@@ -9344,8 +9344,8 @@ a.ucs:0x5784
     ideo:hanyu-dazidian  ( 1 430 6 ) ;
     :eq rep.gb2312:0x4222         ; # &I-G0-4222;
     :eq rep.hanziku-2:0xA8B6      ; # &I-HZK02-A8B6;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.mj:009368        ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.mj:009368        ] ;
     .
     rep.gb2312:0x4222
                :abstract-glyph-of         gb2312:0x4222  .
@@ -9424,8 +9424,8 @@ a.ucs:0x5C2D
     :eq rep.gt-pj-1:13894         ; # &I-GT-01770;
     :eq rep.shinjigen_rev:1428    ; # 尭
     :eq rep.jef-china3:0x47C8     ; # &I-JC3-47C8;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07474 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07474 ] ;
     :subsume
         g2.adobe-japan1-0:01726 ,
         g2.ucs_unicode:0x5C2D ;
@@ -12259,9 +12259,9 @@ rep.mj:009062
     :eq rep.gt-pj-1:15979         ; # &I-GT-06357;
     :eq rep.daikanwa...._.p:05086 ; # &MJ009062;
     :eq rep.shinjigen:1392        ; # &MJ009062;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x2F852        ] ;
-    :from.simplified     a.ucs:0x2F852        ;
+    ideo:simplified-form-of a.ucs:0x2F852        ;
     :subsume
         g2.mj:009062         ,
         repi.hng-khm:02550   ;
@@ -13411,7 +13411,7 @@ a.ucs:0x57C0
     :eq rep.daikanwa:05104        ; # &I-M-05104;
     :eq rep.shinjigen:1372        ; # 埀
     :eq rep.cbeta:01326           ; # &I-CB01326;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02600 ] ;
     :subsume
         g2.ucs_unicode:0x57C0 ;
@@ -14280,7 +14280,7 @@ a.ucs:0x57CA
     :eq rep.cns11643-3:0x3037     ; # &I-C3-3037;
     :eq rep.daikanwa:05115        ; # &I-M-05115;
     :eq rep.cbeta:09928           ; # &I-CB09928;
-    :from.ancient        [ :sources chisebib:yupian ,
+    ideo:ancient-form-of [ :sources chisebib:yupian ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5730         ] ;
     :subsume
@@ -15090,7 +15090,7 @@ rep.mj:009069
     :eq rep.hanyo-denshi...jt:0xAF5D ; # &I-HD-JT-AF5D;
     :eq rep.daikanwa:05124        ; # &I-M-05124;
     :eq rep.shinjigen:1404        ; # &MJ009069;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:009067        ] ;
     :subsume
         g2.mj:009069         ,
@@ -15364,7 +15364,7 @@ rep.cns11643-3:0x3036
     :eq a.ucs_iwds-1:0x57D1       ; # &C3-3036;
     :eq rep.ucs_unicode:0x57D1    ; # &C3-3036;
     :eq rep.daikanwa:05129        ; # &I-M-05129;
-    :from.same           [ :sources chisebib:misc ,
+    ideo:same-as         [ :sources chisebib:misc ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x54F2         ] ;
     :subsume
@@ -16231,7 +16231,7 @@ a.ucs:0x57DC
     :eq rep.gt-pj-1:18232         ; # &I-GT-06583;
     :eq rep.daikanwa:05154        ; # &I-M-05154;
     :eq rep.shinjigen:8566        ; # 埜
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x91CE         ] ;
     :subsume
         g2.ucs_unicode:0x57DC ,
@@ -21604,7 +21604,7 @@ a.ucs:0x2F854
     ideo:strokes           8 ;
     ideo:total-strokes    11 ;
     :eq rep.cns11643-6:0x3E2B     ; # &I-C6-3E2B;
-    :from.same           [ :sources chisebib:ucs ;
+    ideo:same-as         [ :sources chisebib:ucs ;
                            :target  a.ucs:0x580D         ] ;
     .
     rep.cns11643-6:0x3E2B
@@ -23219,7 +23219,7 @@ a.ucs:0x21377
     :eq rep.ucs_unicode:0x5829    ; # 𡍷
     :eq rep.ucs_cns:0x21377       ; # 𡍷
     :eq rep.cns11643-4:0x3673     ; # &I-C4-3673;
-    :from.simplified     rep.cns11643-2:0x3A61 ;
+    ideo:simplified-form-of rep.cns11643-2:0x3A61 ;
     .
     rep.ucs_unicode:0x5829
                :abstract-glyph-of [ :context domain:unicode ;
@@ -24756,8 +24756,8 @@ rep.mj:009176
     :eq rep.gt:06554              ; # &I-GT-06554;
     :eq rep.gt-pj-1:17736         ; # &I-GT-06554;
     :eq rep.jef-china3:0x47CB     ; # &I-JC3-47CB;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:009177        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:009177        ] ;
     :subsume
         g2.mj:009176         ;
     .
@@ -25833,7 +25833,7 @@ rep.daikanwa:05315
     ideo:radical          32 ; # ⼟ 
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
-    :from.same           [ :sources chisebib:wuyin-pianhai ,
+    ideo:same-as         [ :sources chisebib:wuyin-pianhai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x87FB         ] ;
     .
@@ -25900,8 +25900,8 @@ rep.adobe-japan1-0:03597
     :eq rep.daikanwa:05316        ; # &I-M-05316;
     :eq rep.shinjigen_rev:1454    ; # &AJ1-03597;
     :eq rep.cbeta:06237           ; # &I-CB06237;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13384 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13384 ] ;
     :subsume
         g2.ucs_unicode:0x5840 ;
     .
@@ -26080,12 +26080,12 @@ a.ucs:0x5841
     :eq rep.daikanwa...._.p:05316 ; # 塁
     :eq rep.shinjigen_1ed:1450    ; # 塁
     :eq rep.shinjigen_rev:1452    ; # 塁
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :sources chisebib:JP...Jouyou ,
-                                    chisebib:daikanwa ,
-                                    chisebib:shinjigen_1ed ,
-                                    chisebib:shinjigen_rev ;
-                           :target  a.ucs:0x58D8         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :sources chisebib:JP...Jouyou ,
+                                       chisebib:daikanwa ,
+                                       chisebib:shinjigen_1ed ,
+                                       chisebib:shinjigen_rev ;
+                              :target  a.ucs:0x58D8         ] ;
     :subsume
         g2.ucs_unicode:0x5841 ;
     .
@@ -26290,12 +26290,12 @@ rep.adobe-japan1-0:02852
     :eq rep.gt:06653              ; # &I-GT-06653;
     :eq rep.gt-pj-1:16964         ; # &I-GT-06653;
     :eq rep.shinjigen:1436        ; # &AJ1-02852;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x58AE         ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x58AE         ] ;
-    :from.simplified     [ :context domain:ucs     ;
-                           :target  a.ucs:0x58AE         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x58AE         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x58AE         ] ;
+    ideo:simplified-form-of [ :context domain:ucs     ;
+                              :target  a.ucs:0x58AE         ] ;
     :subsume
         g2.ucs_unicode:0x5815 ;
     .
@@ -28855,8 +28855,8 @@ rep.mj:009211
     :eq rep.gt-k:10255            ; # &I-GT-K10255;
     :eq rep.gt-pj-1:17764         ; # &I-GT-06767;
     :eq rep.jef-china3:0x48C7     ; # &I-JC3-48C7;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.mj:009210        ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.mj:009210        ] ;
     :subsume
         g2.mj:009211         ;
     .
@@ -29531,8 +29531,8 @@ rep.mj:009215
     :eq rep.gt-pj-1:17485         ; # &I-GT-06661;
     :eq rep.shinjigen_rev:1440    ; # &MJ009215;
     :eq rep.jef-china3:0x47C9     ; # &I-JC3-47C9;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-0:07746 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-0:07746 ] ;
     :subsume
         g2.mj:009215         ,
         a.ucs:0xFA7C         ,
@@ -31097,8 +31097,8 @@ a.ucs:0x5869
     :eq rep.daikanwa:05382        ; # &I-M-05382;
     :eq rep.shinjigen:9769        ; # 塩
     :eq rep.cbeta:02183           ; # &I-CB02183;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x9E7D         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x9E7D         ] ;
     :subsume
         g2.ucs_unicode:0x5869 ;
     .
@@ -31393,8 +31393,8 @@ rep.adobe-japan1-0:03120
     :eq rep.gt-pj-1:17718         ; # &I-GT-06762;
     :eq rep.daikanwa...ho:0093    ; # &AJ1-03120;
     :eq rep.jef-china3:0x47CA     ; # &I-JC3-47CA;
-    :from.simplified     [ :context domain:JP...jis ;
-                           :target  rep.adobe-japan1-0:07751 ] ;
+    ideo:simplified-form-of [ :context domain:JP...jis ;
+                              :target  rep.adobe-japan1-0:07751 ] ;
     :subsume
         g2.adobe-japan1-0:03120 ;
     .
@@ -31896,7 +31896,7 @@ rep.adobe-japan1-0:04504
     :eq rep.daikanwa:05385        ; # &I-M-05385;
     :eq rep.shinjigen:1435        ; # &AJ1-04504;
     :eq rep.cbeta:00588           ; # &I-CB00588;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  rep.mj:009174        ] ;
     :subsume
         g2.ucs_unicode:0x5872 ;
@@ -32772,7 +32772,7 @@ a.ucs:0x587C
                                        :sources chisebib:maoshi-shu ,
                                                 chisebib:daikanwa ] ,
                                      a.ucs:0x5718         ] ;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  [ :target  a.ucs:0x750E         ;
                                       :sources chisebib:jiyun ,
                                                chisebib:daikanwa ] ,
@@ -34523,7 +34523,7 @@ a.ucs:0x5848
     ideo:strokes           9 ;
     ideo:total-strokes    12 ;
     ideo:hanyu-dazidian  ( 1 468 4 ) ;
-    :from.simplified     a.ucs:0x588D         ;
+    ideo:simplified-form-of a.ucs:0x588D         ;
     :subsume
         rep.ucs_unicode:0x5848 ,
         rep.cns11643-2:0x3A69 ;
@@ -35410,8 +35410,8 @@ a.ucs:0x5897
     :eq rep.gt-pj-1:16765         ; # &I-GT-06835;
     :eq rep.daikanwa...._.p:05448 ; # 増
     :eq rep.shinjigen:1482        ; # 増
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.mj:009289        ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.mj:009289        ] ;
     :subsume
         g2.ucs_unicode:0x5897 ;
     .
@@ -35573,8 +35573,8 @@ a.ucs:0x5899
     ideo:hanyu-dazidian  ( 1 479 6 ) ;
     :eq rep.gb2312:0x473D         ; # &I-G0-473D;
     :eq rep.hanziku-2:0xB2B4      ; # &I-HZK02-B2B4;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x58BB         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x58BB         ] ;
     .
     rep.gb2312:0x473D
                :abstract-glyph-of         gb2312:0x473D  .
@@ -37107,8 +37107,8 @@ rep.adobe-japan1-0:03709
     :eq rep.gt-k:11176            ; # &I-GT-K11176;
     :eq rep.gt-pj-1:19279         ; # &I-GT-06861;
     :eq rep.shinjigen:1487        ; # &AJ1-03709;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  rep.adobe-japan1-4:13387 ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  rep.adobe-japan1-4:13387 ] ;
     :subsume
         g2.adobe-japan1-0:03709 ;
     .
@@ -38108,7 +38108,7 @@ a.ucs:0x21426
     :eq rep.shinjigen:1438        ; # 𡐦
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x58AE         ] ;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x58AE         ] ;
     :subsume
@@ -38164,10 +38164,10 @@ a.ucs:0x58AF
     :eq a.big5:0xE54F             ; # &I-B-E54F;
     :eq rep.daikanwa:05483        ; # &I-M-05483;
     :eq rep.shinjigen:1439        ; # 墯
-    :from.same           [ :sources chisebib:zihui ,
+    ideo:same-as         [ :sources chisebib:zihui ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x21426        ] ;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x58AE         ] ;
     :subsume
         g2.ucs_unicode:0x58AF ,
@@ -39165,7 +39165,7 @@ a.ucs:0x58BA
     ideo:hanyu-dazidian  ( 1 492 1 ) ;
     isd:structure [ a idc:⿰ ;
         isd:left     a.ucs:0x571F ; # 土
-        isd:right    a.iwds-1:0281   # &IWDS1-281;
+        isd:right    a.ucs_component:0x5967   # &A-compU+5967;
     ] ;
     .
 
@@ -39386,7 +39386,7 @@ a.ucs:0x58BB
     :eq rep.gt-pj-1:21590         ; # &I-GT-06973;
     :eq rep.daikanwa:05505        ; # &I-M-05505;
     :eq rep.shinjigen:4720        ; # 墻
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7246         ] ;
     :subsume
         g2.ucs_unicode:0x58BB ;
@@ -39906,7 +39906,7 @@ a.ucs:0x58BF
     :eq rep.daikanwa:05511        ; # &I-M-05511;
     :form-of             [ :sources chisebib:jiyun ;
                            :target  rep.adobe-japan1-4:13950 ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  rep.adobe-japan1-4:13950 ] ;
     :subsume
@@ -40411,7 +40411,7 @@ a.ucs:0x58C3
     :eq rep.daikanwa:05520        ; # &I-M-05520;
     :eq rep.shinjigen:5081        ; # 壃
     :eq rep.cbeta:00605           ; # &I-CB00605;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x7586         ] ;
     :subsume
         g2.ucs_unicode:0x58C3 ;
@@ -41299,8 +41299,8 @@ rep.adobe-japan1-0:01397
     :eq rep.gt-pj-1:12917         ; # &I-GT-06958;
     :eq rep.daikanwa...._.p:05541 ; # &AJ1-01397;
     :eq rep.shinjigen:1501        ; # &AJ1-01397;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x58DE         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x58DE         ] ;
     :subsume
         g2.ucs_unicode:0x58CA ,
         g2.cns11643-3:0x5049 ;
@@ -41491,8 +41491,8 @@ a.ucs:0x58CC
     :eq rep.gt:06976              ; # &I-GT-06976;
     :eq rep.gt-pj-1:15981         ; # &I-GT-06976;
     :eq rep.shinjigen:1504        ; # 壌
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x58E4         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x58E4         ] ;
     :subsume
         g2.ucs_unicode:0x58CC ;
     .
@@ -45673,7 +45673,7 @@ rep.gt:07108
     :form-of             [ :context domain:Zetian  ;
                            :sources chisebib:jiyun ;
                            :target  a.ucs:0x521D         ] ;
-    :from.same           [ :sources chisebib:jiyun ,
+    ideo:same-as         [ :sources chisebib:jiyun ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x521D         ] ;
     :from.unknown        a.ucs:0x22030        ;