diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml b/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
index 13fcc17..efed27b 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/checkitem.xml
@@ -13,7 +13,7 @@
     <checkitem type="error" id="C_1000.0">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -26,7 +26,7 @@
     <checkitem type="error" id="C_1000.1">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -39,7 +39,7 @@
     <checkitem type="error" id="C_1000.2">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -52,7 +52,7 @@
     <checkitem type="error" id="C_1000.3">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -65,7 +65,7 @@
     <checkitem type="error" id="C_1000.4">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -78,7 +78,7 @@
     <checkitem type="warning" id="C_1000.5">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -91,7 +91,7 @@
     <checkitem type="user" id="C_1000.6">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -104,7 +104,7 @@
     <checkitem type="warning" id="C_1000.7">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -117,7 +117,7 @@
     <checkitem type="user" id="C_1000.8">
         <guideline>
             <gItem id="3.2" name="WCAG"/>
-            <gItem techniques="H88" id="7.4.1.1" name="JIS"/>
+            <gItem techniques="H88" id="4.1.1" name="JIS"/>
             <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -131,7 +131,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="a" name="Section508"/>
-            <gItem techniques="H37,H67,F38,F65" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="H37,H67,F38,F65" id="1.1.1" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem techniques="H37,H67,F38,F65" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -147,7 +147,7 @@
             <gItem id="1.1" name="WCAG"/>
             <gItem id="a" name="Section508"/>
             <gItem id="n" name="Section508"/>
-            <gItem techniques="H36,F65" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="H36,F65" id="1.1.1" name="JIS"/>
             <gItem id="7" name="IBMGuideline"/>
             <gItem techniques="H36,F65" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -162,7 +162,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="a" name="Section508"/>
-            <gItem techniques="H24,F65" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="H24,F65" id="1.1.1" name="JIS"/>
             <gItem id="2" name="IBMGuideline"/>
             <gItem techniques="H24,F65" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -188,7 +188,7 @@
     <checkitem type="warning" id="B_5">
         <guideline>
             <gItem id="1.1" name="WCAG"/>
-            <gItem techniques="F30,G94" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="F30,G94" id="1.1.1" name="JIS"/>
             <gItem id="7" name="IBMGuideline"/>
             <gItem techniques="F30,G94" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -202,7 +202,7 @@
     <checkitem type="warning" id="B_6">
         <guideline>
             <gItem id="1.1" name="WCAG"/>
-            <gItem techniques="F30,G94" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="F30,G94" id="1.1.1" name="JIS"/>
             <gItem id="2" name="IBMGuideline"/>
             <gItem techniques="F30,G94" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -217,7 +217,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G123,G124" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G123,G124" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G123,G124" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -231,7 +231,7 @@
     <checkitem type="error" id="B_9">
         <guideline>
             <gItem id="13.1" name="WCAG"/>
-            <gItem techniques="H2" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="H2" id="1.1.1" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem id="2" name="IBMGuideline"/>
             <gItem id="7" name="IBMGuideline"/>
@@ -248,7 +248,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -263,9 +263,9 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="H42" id="7.1.3.1" name="JIS"/>
-            <gItem techniques="G1, G123, G124, H69" id="7.2.4.1" name="JIS"/>
-            <gItem techniques="G141" id="7.2.4.10" name="JIS"/>
+            <gItem techniques="H42" id="1.3.1" name="JIS"/>
+            <gItem techniques="G1, G123, G124, H69" id="2.4.1" name="JIS"/>
+            <gItem techniques="G141" id="2.4.10" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="H42" id="1.3.1" name="WCAG 2.0"/>
             <gItem techniques="G1, G123, G124, H69" id="2.4.1" name="WCAG 2.0"/>
@@ -282,9 +282,9 @@
     <checkitem type="error" id="B_14">
         <guideline>
             <gItem id="13.1" name="WCAG"/>
-            <gItem techniques="H30" id="7.1.1.1" name="JIS"/>
-            <gItem techniques="H30" id="7.2.4.4" name="JIS"/>
-            <gItem techniques="H30" id="7.2.4.9" name="JIS"/>
+            <gItem techniques="H30" id="1.1.1" name="JIS"/>
+            <gItem techniques="H30" id="2.4.4" name="JIS"/>
+            <gItem techniques="H30" id="2.4.9" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="H30" id="1.1.1" name="WCAG 2.0"/>
             <gItem techniques="H30" id="2.4.4" name="WCAG 2.0"/>
@@ -301,7 +301,7 @@
     <checkitem type="warning" id="B_15">
         <guideline>
             <gItem id="14.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -329,7 +329,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -344,7 +344,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -359,7 +359,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -374,7 +374,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -389,7 +389,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -404,8 +404,8 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G123,H69" id="7.2.4.1" name="JIS"/>
-            <gItem id="7.2.4.10" name="JIS"/>
+            <gItem techniques="G123,H69" id="2.4.1" name="JIS"/>
+            <gItem id="2.4.10" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G123,H69" id="2.4.1" name="WCAG 2.0"/>
             <gItem id="2.4.10" name="WCAG 2.0"/>
@@ -421,8 +421,8 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G123,H69" id="7.2.4.1" name="JIS"/>
-            <gItem id="7.2.4.10" name="JIS"/>
+            <gItem techniques="G123,H69" id="2.4.1" name="JIS"/>
+            <gItem id="2.4.10" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G123,H69" id="2.4.1" name="WCAG 2.0"/>
             <gItem id="2.4.10" name="WCAG 2.0"/>
@@ -438,8 +438,8 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G123,H69" id="7.2.4.1" name="JIS"/>
-            <gItem id="7.2.4.10" name="JIS"/>
+            <gItem techniques="G123,H69" id="2.4.1" name="JIS"/>
+            <gItem id="2.4.10" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G123,H69" id="2.4.1" name="WCAG 2.0"/>
             <gItem id="2.4.10" name="WCAG 2.0"/>
@@ -454,9 +454,9 @@
     <checkitem type="warning" id="B_25">
         <guideline>
             <gItem id="13.1" name="WCAG"/>
-            <gItem techniques="H30" id="7.1.1.1" name="JIS"/>
-            <gItem techniques="H30" id="7.2.4.4" name="JIS"/>
-            <gItem techniques="H30" id="7.2.4.9" name="JIS"/>
+            <gItem techniques="H30" id="1.1.1" name="JIS"/>
+            <gItem techniques="H30" id="2.4.4" name="JIS"/>
+            <gItem techniques="H30" id="2.4.9" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="H30" id="1.1.1" name="WCAG 2.0"/>
             <gItem techniques="H30" id="2.4.4" name="WCAG 2.0"/>
@@ -474,7 +474,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G1" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G1" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -489,7 +489,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="a" name="Section508"/>
-            <gItem techniques="F30,G94" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="F30,G94" id="1.1.1" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem techniques="F30,G94" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
@@ -504,7 +504,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="14.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
@@ -519,7 +519,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="14.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem id="7" name="IBMGuideline"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
@@ -534,7 +534,7 @@
         <guideline>
             <gItem id="1.1" name="WCAG"/>
             <gItem id="14.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem id="2" name="IBMGuideline"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
@@ -549,7 +549,7 @@
         <guideline>
             <gItem id="13.6" name="WCAG"/>
             <gItem id="o" name="Section508"/>
-            <gItem techniques="G123,G124" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G123,G124" id="2.4.1" name="JIS"/>
             <gItem id="8" name="IBMGuideline"/>
             <gItem techniques="G123,G124" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
@@ -563,7 +563,7 @@
     <checkitem type="warning" id="B_34">
         <guideline>
             <gItem id="1.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
@@ -576,7 +576,7 @@
     </checkitem>
     <checkitem type="warning" id="B_35">
         <guideline>
-            <gItem techniques="G1,G123,G124" id="7.2.4.1" name="JIS"/>
+            <gItem techniques="G1,G123,G124" id="2.4.1" name="JIS"/>
             <gItem techniques="G1,G123,G124" id="2.4.1" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -598,7 +598,7 @@
     <checkitem type="warning" id="B_37">
         <guideline>
             <gItem id="14.1" name="WCAG"/>
-            <gItem techniques="C8,F32" id="7.1.3.2" name="JIS"/>
+            <gItem techniques="C8,F32" id="1.3.2" name="JIS"/>
             <gItem id="7" name="IBMGuideline"/>
             <gItem techniques="C8,F32" id="1.3.2" name="WCAG 2.0"/>
         </guideline>
@@ -612,8 +612,8 @@
     <checkitem type="error" id="L_1.0">
         <guideline>
             <gItem id="2.2" name="WCAG"/>
-            <gItem techniques="G18,G145" id="7.1.4.3" name="JIS"/>
-            <gItem techniques="G17,G18" id="7.1.4.6" name="JIS"/>
+            <gItem techniques="G18,G145" id="1.4.3" name="JIS"/>
+            <gItem techniques="G17,G18" id="1.4.6" name="JIS"/>
             <gItem techniques="G18,G145" id="1.4.3" name="WCAG 2.0"/>
             <gItem techniques="G17,G18" id="1.4.6" name="WCAG 2.0"/>
         </guideline>
@@ -627,8 +627,8 @@
     <checkitem type="warning" id="L_1.1">
         <guideline>
             <gItem id="2.2" name="WCAG"/>
-            <gItem techniques="G18" id="7.1.4.3" name="JIS"/>
-            <gItem techniques="G17,G18" id="7.1.4.6" name="JIS"/>
+            <gItem techniques="G18" id="1.4.3" name="JIS"/>
+            <gItem techniques="G17,G18" id="1.4.6" name="JIS"/>
             <gItem techniques="G18" id="1.4.3" name="WCAG 2.0"/>
             <gItem techniques="G17,G18" id="1.4.6" name="WCAG 2.0"/>
         </guideline>
@@ -642,7 +642,7 @@
     <checkitem type="warning" id="L_1.2">
         <guideline>
             <gItem id="2.2" name="WCAG"/>
-            <gItem techniques="G17" id="7.1.4.6" name="JIS"/>
+            <gItem techniques="G17" id="1.4.6" name="JIS"/>
             <gItem techniques="G17" id="1.4.6" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -667,8 +667,8 @@
             <gItem id="2.1" name="WCAG"/>
             <gItem id="2.2" name="WCAG"/>
             <gItem id="c" name="Section508"/>
-            <gItem techniques="G18,G145" id="7.1.4.3" name="JIS"/>
-            <gItem techniques="G17,G18" id="7.1.4.6" name="JIS"/>
+            <gItem techniques="G18,G145" id="1.4.3" name="JIS"/>
+            <gItem techniques="G17,G18" id="1.4.6" name="JIS"/>
             <gItem id="12" name="IBMGuideline"/>
             <gItem techniques="G18,G145" id="1.4.3" name="WCAG 2.0"/>
             <gItem techniques="G17,G18" id="1.4.6" name="WCAG 2.0"/>
@@ -683,7 +683,7 @@
     <checkitem type="error" id="L_4">
         <guideline>
             <gItem id="3.4" name="WCAG"/>
-            <gItem techniques="C12,C13,C14" id="7.1.4.4" name="JIS"/>
+            <gItem techniques="C12,C13,C14" id="1.4.4" name="JIS"/>
             <gItem techniques="C12,C13,C14" id="1.4.4" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -704,7 +704,7 @@
     </checkitem>
     <checkitem type="error" id="L_6">
         <guideline>
-            <gItem techniques="C12,C13,C14" id="7.1.4.4" name="JIS"/>
+            <gItem techniques="C12,C13,C14" id="1.4.4" name="JIS"/>
             <gItem techniques="C12,C13,C14" id="1.4.4" name="WCAG 2.0"/>
         </guideline>
         <metrics>
@@ -716,9 +716,9 @@
     </checkitem>
     <checkitem type="user" id="L_10">
         <guideline>
-            <gItem techniques="F3" id="7.1.1.1" name="JIS"/>
-            <gItem techniques="F83, G18, G145" id="7.1.4.3" name="JIS"/>
-            <gItem techniques="F83, G17, G18" id="7.1.4.6" name="JIS"/>
+            <gItem techniques="F3" id="1.1.1" name="JIS"/>
+            <gItem techniques="F83, G18, G145" id="1.4.3" name="JIS"/>
+            <gItem techniques="F83, G17, G18" id="1.4.6" name="JIS"/>
             <gItem techniques="F3" id="1.1.1" name="WCAG 2.0"/>
             <gItem techniques="F83, G18, G145" id="1.4.3" name="WCAG 2.0"/>
             <gItem techniques="F83, G17, G18" id="1.4.6" name="WCAG 2.0"/>
@@ -733,7 +733,7 @@
     <checkitem type="error" id="B_38">
         <guideline>
             <gItem id="1.1" name="WCAG"/>
-            <gItem techniques="F30,G94,H67" id="7.1.1.1" name="JIS"/>
+            <gItem techniques="F30,G94,H67" id="1.1.1" name="JIS"/>
             <gItem id="1" name="IBMGuideline"/>
             <gItem techniques="F30,G94,H67" id="1.1.1" name="WCAG 2.0"/>
         </guideline>
diff --git a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
index 262e88b..436d9aa 100644
--- a/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
+++ b/plugins/org.eclipse.actf.visualization.eval/resources/guidelines/jis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
- Copyright (c) 2005, 2010 IBM Corporation and others.
+ Copyright (c) 2005, 2016 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -31,187 +31,187 @@
  <mimetype>application/xhtml+xml</mimetype>
 </mimetypes>
 <items>
- <gItem id="7.1.1.1" level="A">
+ <gItem id="1.1.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/text-equiv-all.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.1" level="A">
+ <gItem id="1.2.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-av-only-alt.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.2" level="A">
+ <gItem id="1.2.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-captions.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.3" level="A">
+ <gItem id="1.2.3" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-audio-desc.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.4" level="AA">
+ <gItem id="1.2.4" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-real-time-captions.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.5" level="AA">
+ <gItem id="1.2.5" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-audio-desc-only.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.6" level="AAA">
+ <gItem id="1.2.6" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-sign.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.7" level="AAA">
+ <gItem id="1.2.7" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-extended-ad.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.8" level="AAA">
+ <gItem id="1.2.8" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-text-doc.html</helpUrl>
  </gItem>
- <gItem id="7.1.2.9" level="AAA">
+ <gItem id="1.2.9" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/media-equiv-live-audio-only.html</helpUrl>
  </gItem>
- <gItem id="7.1.3.1" level="A">
+ <gItem id="1.3.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/content-structure-separation-programmatic.html</helpUrl>
  </gItem>
- <gItem id="7.1.3.2" level="A">
+ <gItem id="1.3.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/content-structure-separation-sequence.html</helpUrl>
  </gItem>
- <gItem id="7.1.3.3" level="A">
+ <gItem id="1.3.3" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/content-structure-separation-understanding.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.1" level="A">
+ <gItem id="1.4.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-without-color.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.2" level="A">
+ <gItem id="1.4.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-dis-audio.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.3" level="AA">
+ <gItem id="1.4.3" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.4" level="AA">
+ <gItem id="1.4.4" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-scale.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.5" level="AA">
+ <gItem id="1.4.5" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-text-presentation.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.6" level="AAA">
+ <gItem id="1.4.6" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast7.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.7" level="AAA">
+ <gItem id="1.4.7" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-noaudio.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.8" level="AAA">
+ <gItem id="1.4.8" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-visual-presentation.html</helpUrl>
  </gItem>
- <gItem id="7.1.4.9" level="AAA">
+ <gItem id="1.4.9" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/visual-audio-contrast-text-images.html</helpUrl>
  </gItem>
- <gItem id="7.2.1.1" level="A">
+ <gItem id="2.1.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/keyboard-operation-keyboard-operable.html</helpUrl>
  </gItem>
- <gItem id="7.2.1.2" level="A">
+ <gItem id="2.1.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/keyboard-operation-trapping.html</helpUrl>
  </gItem>
- <gItem id="7.2.1.3" level="AAA">
+ <gItem id="2.1.3" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/keyboard-operation-all-funcs.html</helpUrl>
  </gItem>
- <gItem id="7.2.2.1" level="A">
+ <gItem id="2.2.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/time-limits-required-behaviors.html</helpUrl>
  </gItem>
- <gItem id="7.2.2.2" level="A">
+ <gItem id="2.2.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/time-limits-pause.html</helpUrl>
  </gItem>
- <gItem id="7.2.2.3" level="AAA">
+ <gItem id="2.2.3" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/time-limits-no-exceptions.html</helpUrl>
  </gItem>
- <gItem id="7.2.2.4" level="AAA">
+ <gItem id="2.2.4" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/time-limits-postponed.html</helpUrl>
  </gItem>
- <gItem id="7.2.2.5" level="AAA">
+ <gItem id="2.2.5" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/time-limits-server-timeout.html</helpUrl>
  </gItem>
- <gItem id="7.2.3.1" level="A">
+ <gItem id="2.3.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/seizure-does-not-violate.html</helpUrl>
  </gItem>
- <gItem id="7.2.3.2" level="AAA">
+ <gItem id="2.3.2" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/seizure-three-times.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.1" level="A">
+ <gItem id="2.4.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-skip.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.2" level="A">
+ <gItem id="2.4.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-title.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.3" level="A">
+ <gItem id="2.4.3" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-focus-order.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.4" level="A">
+ <gItem id="2.4.4" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-refs.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.5" level="AA">
+ <gItem id="2.4.5" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-mult-loc.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.6" level="AA">
+ <gItem id="2.4.6" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-descriptive.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.7" level="AA">
+ <gItem id="2.4.7" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-focus-visible.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.8" level="AAA">
+ <gItem id="2.4.8" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-location.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.9" level="AAA">
+ <gItem id="2.4.9" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-link.html</helpUrl>
  </gItem>
- <gItem id="7.2.4.10" level="AAA">
+ <gItem id="2.4.10" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/navigation-mechanisms-headings.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.1" level="A">
+ <gItem id="3.1.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-doc-lang-id.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.2" level="AA">
+ <gItem id="3.1.2" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-other-lang-id.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.3" level="AAA">
+ <gItem id="3.1.3" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-idioms.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.4" level="AAA">
+ <gItem id="3.1.4" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-located.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.5" level="AAA">
+ <gItem id="3.1.5" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-supplements.html</helpUrl>
  </gItem>
- <gItem id="7.3.1.6" level="AAA">
+ <gItem id="3.1.6" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/meaning-pronunciation.html</helpUrl>
  </gItem>
- <gItem id="7.3.2.1" level="A">
+ <gItem id="3.2.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/consistent-behavior-receive-focus.html</helpUrl>
  </gItem>
- <gItem id="7.3.2.2" level="A">
+ <gItem id="3.2.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/consistent-behavior-unpredictable-change.html</helpUrl>
  </gItem>
- <gItem id="7.3.2.3" level="AA">
+ <gItem id="3.2.3" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/consistent-behavior-consistent-locations.html</helpUrl>
  </gItem>
- <gItem id="7.3.2.4" level="AA">
+ <gItem id="3.2.4" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/consistent-behavior-consistent-functionality.html</helpUrl>
  </gItem>
- <gItem id="7.3.2.5" level="AAA">
+ <gItem id="3.2.5" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/consistent-behavior-no-extreme-changes-context.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.1" level="A">
+ <gItem id="3.3.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-identified.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.2" level="A">
+ <gItem id="3.3.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-cues.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.3" level="AA">
+ <gItem id="3.3.3" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-suggestions.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.4" level="AA">
+ <gItem id="3.3.4" level="AA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-reversible.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.5" level="AAA">
+ <gItem id="3.3.5" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-context-help.html</helpUrl>
  </gItem>
- <gItem id="7.3.3.6" level="AAA">
+ <gItem id="3.3.6" level="AAA">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/minimize-error-reversible-all.html</helpUrl>
  </gItem>
- <gItem id="7.4.1.1" level="A">
+ <gItem id="4.1.1" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/ensure-compat-parses.html</helpUrl>
  </gItem>
- <gItem id="7.4.1.2" level="A">
+ <gItem id="4.1.2" level="A">
   <helpUrl>http://waic.jp/docs/UNDERSTANDING-WCAG20/ensure-compat-rsv.html</helpUrl>
  </gItem>
 </items>
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/messages_ja.properties b/plugins/org.eclipse.actf.visualization.eval/src/messages_ja.properties
index af4bf4e..5490696 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/messages_ja.properties
+++ b/plugins/org.eclipse.actf.visualization.eval/src/messages_ja.properties
@@ -50,11 +50,11 @@
 GuidelinePreferencePage_0=\u30ab\u30c6\u30b4\u30ea\u30fc
 GuidelinePreferencePage_1=\u30ac\u30a4\u30c9\u30e9\u30a4\u30f3
 
-Techniques=\u5b9f\u88c5\u65b9\u6cd5
+Techniques=\u9054\u6210\u65b9\u6cd5
 Type = \u7a2e\u5225
 Help = \u30d8\u30eb\u30d7
 
 Perceivable = \u77e5\u899a\u53ef\u80fd
 Operable = \u64cd\u4f5c\u53ef\u80fd
 Understandable = \u7406\u89e3\u53ef\u80fd
-Robust = \u9811\u5065\u6027 
\ No newline at end of file
+Robust = \u5805\u308d\u3046\uff08\u7262\uff09
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
index 5f44703..caf3693 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and Others
+ * Copyright (c) 2005, 2016 IBM Corporation and Others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -126,7 +126,6 @@
 
 	// TODO guideline base -> check item base On/Off
 
-	@SuppressWarnings("unchecked")
 	private GuidelineHolder() {
 		Bundle bundle = EvaluationPlugin.getDefault().getBundle();
 		Enumeration<URL> guidelines = bundle.findEntries(
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
index 4aa9e5d..e12d5de 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and Others
+ * Copyright (c) 2005, 2016 IBM Corporation and Others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,6 +85,7 @@
 
 	private Stack<Short> statusStack = new Stack<Short>();
 
+	@SuppressWarnings("unused")
 	private String curValue = "";
 
 	private EvaluationItemImpl curItem = new EvaluationItemImpl("", "");
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/messages_ja.properties b/plugins/org.eclipse.actf.visualization.ui.report/src/messages_ja.properties
index 8f278d3..ec80d48 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/messages_ja.properties
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/messages_ja.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2009 IBM Corporation and others.
+# Copyright (c) 2003, 2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -34,5 +34,5 @@
 GuidelineSubMenu_0=\u9054\u6210\u57fa\u6e96\u306e\u30d8\u30eb\u30d7\u304c\u6709\u308a\u307e\u305b\u3093.
 SrcViewerForPT_0=HTML \u30bd\u30fc\u30b9
 Copy = \u30b3\u30d4\u30fc
-ViewTechniques=\u5b9f\u88c5\u65b9\u6cd5\u3092\u898b\u308b
-NoTechniques=\u5b9f\u88c5\u65b9\u6cd5\u306e\u30d8\u30eb\u30d7\u304c\u6709\u308a\u307e\u305b\u3093.
\ No newline at end of file
+ViewTechniques=\u9054\u6210\u65b9\u6cd5\u3092\u898b\u308b
+NoTechniques=\u9054\u6210\u65b9\u6cd5\u306e\u30d8\u30eb\u30d7\u304c\u6709\u308a\u307e\u305b\u3093.
\ No newline at end of file