Fix Javadoc and rename a test method to explain behavior correctly

Change-Id: Ib992c68de5ce9129ca24621604ead2bfc2add848

@@ -413,10 +413,10 @@ public class CriterionCodecTest {
     }
     }
 
 
     /**
     /**
-     * Tests optical signal type criterion.
+     * Tests Och signal type criterion.
      */
      */
     @Test
     @Test
-    public void matchOpticalSignalTypeTest() {
+    public void matchOchSignalTypeTest() {
         Criterion criterion = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
         Criterion criterion = Criteria.matchOchSignalType(OchSignalType.FIXED_GRID);
         ObjectNode result = criterionCodec.encode(criterion, context);
         ObjectNode result = criterionCodec.encode(criterion, context);
         assertThat(result, matchesCriterion(criterion));
         assertThat(result, matchesCriterion(criterion));

@@ -464,7 +464,7 @@ public final class CriterionJsonMatcher extends
     }
     }
 
 
     /**
     /**
-     * Matches an optical signal type criterion object.
+     * Matches an Och signal type criterion object.
      *
      *
      * @param criterion criterion to match
      * @param criterion criterion to match
      * @return true if the JSON matches the criterion, false otherwise.
      * @return true if the JSON matches the criterion, false otherwise.