- Renamed subspan to submatch, ambiguity with classRef-operator 'submatch' is resolved by the number of arguments 
- Set deprecation policy to 3 months (expires end of October)
diff --git a/src/test/java/PoliqarpPlusTreeTest.java b/src/test/java/PoliqarpPlusTreeTest.java
index 4f835fb..046c374 100644
--- a/src/test/java/PoliqarpPlusTreeTest.java
+++ b/src/test/java/PoliqarpPlusTreeTest.java
@@ -1149,7 +1149,7 @@
 	
 	@Test
 	public void testSubspan() throws QueryException {
-		query = "subspan(1:<s>)";
+		query = "submatch(1,:<s>)";
 		expected = 
 			"{@type=korap:reference, operation=operation:focus, operands=[" +
 					"{@type=korap:span, key=s}" +
@@ -1159,7 +1159,7 @@
 		map = ppt.getRequestMap().get("query").toString();
 		assertEquals(expected.replaceAll(" ", ""), map.replaceAll(" ", ""));
 	
-		query = "subspan(1,4:<s>)";
+		query = "submatch(1,4:<s>)";
 		expected = 
 			"{@type=korap:reference, operation=operation:focus, operands=[" +
 					"{@type=korap:span, key=s}" +
@@ -1169,7 +1169,7 @@
 		map = ppt.getRequestMap().get("query").toString();
 		assertEquals(expected.replaceAll(" ", ""), map.replaceAll(" ", ""));
 		
-		query = "subspan(1,4:contains(<s>,[base=Haus]))";
+		query = "submatch(1,4:contains(<s>,[base=Haus]))";
 		expected = 
 			"{@type=korap:reference, operation=operation:focus, operands=[" +
 				"{@type=korap:group, operation=operation:position, frame=frame:contains, operands=[" +