diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
index 7ae0e30..d71b872 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
@@ -15,6 +15,6 @@
 
 // load dataset DBLP from nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
 load dataset DBLP 
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1:///fuzzyjoin/data/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
index c1eb120..4353a4b 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
@@ -15,6 +15,6 @@
 
 // load dataset CSX from nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
 load dataset  CSX
-using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
 (("path"="nc1:///asterix/asterix-app/data/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
 
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json b/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json
index 2b8ce44..44d7027 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql-plus.json
@@ -3,7 +3,7 @@
   {
    "connector": {
     "id": "551aa36c-8048-46b7-8eff-f4bbe1afce83",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:e0d76180-55c0-41db-9d4e-b0b80eed3922",
@@ -15,7 +15,7 @@
   {
    "connector": {
     "id": "3b0c6d28-b75e-4040-ae5c-0a20a0729d9c",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:c49457b9-a4be-48d2-8e82-50820e0ca618",
@@ -27,7 +27,7 @@
   {
    "connector": {
     "id": "3c6dad81-1d96-41aa-976a-0cdcb9e2071e",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:ac276d4f-0bd6-468e-b314-da000f9141ea",
@@ -39,7 +39,7 @@
   {
    "connector": {
     "id": "8ca6e18f-9e2f-4cf7-a15d-b49da1e18327",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:da3da2a7-80c7-47a2-9d72-23b7c8f3d669",
@@ -51,7 +51,7 @@
   {
    "connector": {
     "id": "1d3ac011-b83a-4690-b1fe-0dd906706823",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:b1922618-827e-4276-a89e-5bd257cecd7d",
@@ -63,7 +63,7 @@
   {
    "connector": {
     "id": "376d0c4e-a260-4de2-af6f-46cfb7f35736",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b",
@@ -75,7 +75,7 @@
   {
    "connector": {
     "id": "a63f8c84-bb1f-4d18-9008-1f5a3d657e33",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:769e1d5c-5b5b-4437-8764-a6e0bcf8d210",
@@ -87,7 +87,7 @@
   {
    "connector": {
     "id": "f99bf8e6-f528-4e14-81a2-029185b19c07",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:b504c4ff-8226-43c2-b06f-a9ad59e54312",
@@ -99,7 +99,7 @@
   {
    "connector": {
     "id": "c20357ab-1ac9-427a-8401-680e0893310e",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:baa3f1d6-1425-4180-a1de-2878f16e95d5",
@@ -111,7 +111,7 @@
   {
    "connector": {
     "id": "3314f84e-770c-40fe-b4fd-84e9d4a1b645",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:1da790c0-ca3c-4833-8280-5c7c2d0ac23c",
@@ -123,7 +123,7 @@
   {
    "connector": {
     "id": "9cc19566-7513-4025-ab45-d63de159601e",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:19350ade-da75-4a1d-90e7-4f6753ef2732",
@@ -135,7 +135,7 @@
   {
    "connector": {
     "id": "de442773-23d2-437b-aed1-5871bcd41acb",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:da4389d3-57a0-41fa-973b-cfdedca126d4",
@@ -147,7 +147,7 @@
   {
    "connector": {
     "id": "befeab23-9011-43d6-bb2e-16b00b9733d3",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:421e3891-f7b0-4a50-a1d0-5c82099823f2",
@@ -159,7 +159,7 @@
   {
    "connector": {
     "id": "d995afde-8485-4c9a-81f8-6d3fae1ae276",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:93596e19-b912-4071-94a9-512133274499",
@@ -171,7 +171,7 @@
   {
    "connector": {
     "id": "5d5d91af-30b0-4257-93a3-88ab3b8ea87e",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:31c39bd3-6724-42bc-b15f-9331d434598f",
@@ -183,7 +183,7 @@
   {
    "connector": {
     "id": "6a9de34a-2de7-4943-affd-ae5442c68d02",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:a14d6687-2c52-41f9-95ed-ab9f4b451180",
@@ -195,7 +195,7 @@
   {
    "connector": {
     "id": "5e8289ff-2801-441e-9497-0e57a39bb4a3",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:7d6eb230-0efc-42a7-b279-98e0258073e6",
@@ -207,7 +207,7 @@
   {
    "connector": {
     "id": "214c15e9-c25f-4d99-a5ff-2cf59cb7f4df",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:36b24630-2bdf-47e2-ade4-21f95efde5a8",
@@ -219,7 +219,7 @@
   {
    "connector": {
     "id": "d75a162f-f2c2-4cb3-b603-9010e628e3c9",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:66f6f703-1a20-40b2-a3a3-514412cabb03",
@@ -231,7 +231,7 @@
   {
    "connector": {
     "id": "69eab14a-0758-400b-928f-b59b7f3a9aad",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:ff24200a-c665-4ca3-baa8-09fd2ca0ae04",
@@ -243,7 +243,7 @@
   {
    "connector": {
     "id": "44e2def1-3cf3-4a5f-8ad8-c5d02427d9c8",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:9c797900-e6cf-44ad-b5e3-869e56fd27ba",
@@ -255,7 +255,7 @@
   {
    "connector": {
     "id": "41c2e83d-8363-463d-b5fe-88eab1a5ed6a",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:c66e50f0-f068-43fd-833e-32f9b6117f2f",
@@ -267,7 +267,7 @@
   {
    "connector": {
     "id": "f8972eb8-065e-4f7e-acc2-48643c56661a",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:9678a828-3e96-4391-be41-8da45721ca3d",
@@ -279,7 +279,7 @@
   {
    "connector": {
     "id": "34d4f80f-a18d-4554-8b54-01f262b4dd6f",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:92f64732-b166-4765-bb0d-3d36a566005a",
@@ -291,7 +291,7 @@
   {
    "connector": {
     "id": "590b6750-19b8-4171-9875-616e30ccaf16",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:785d1650-a0b5-4f63-bfca-fe68d292c294",
@@ -303,7 +303,7 @@
   {
    "connector": {
     "id": "96c2ddc2-9be2-4279-894f-dcce41f2bf65",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:0bdd825d-3c80-4769-95ec-3d8ed0fec67a",
@@ -315,7 +315,7 @@
   {
    "connector": {
     "id": "59227da7-cbba-4414-a3e5-b9d20796d743",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:066a993b-57b5-47ad-8a18-fef27b8e16f4",
@@ -327,7 +327,7 @@
   {
    "connector": {
     "id": "f0105e8e-7916-4abf-aa1a-cd3ab5cdbaea",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:bb03494d-e0a9-4898-8b80-64c54da6a20c",
@@ -339,7 +339,7 @@
   {
    "connector": {
     "id": "ce0d0b9e-d59a-4097-98f5-44e8af699016",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9",
@@ -351,7 +351,7 @@
   {
    "connector": {
     "id": "10daf2fc-aa60-4604-a150-9e4d4f42106a",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:9e589fcc-04fa-4834-ba1f-253470672434",
@@ -363,7 +363,7 @@
   {
    "connector": {
     "id": "be9e9778-a426-4701-b28e-4f9b1f766f11",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:21db32ee-7d3e-42f5-9541-2145ef2e55e2",
@@ -375,7 +375,7 @@
   {
    "connector": {
     "id": "cbf6135d-43f8-49b5-82ab-eeeffa5ab984",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:0066c7f5-f720-4098-8908-bebee74a409d",
@@ -387,7 +387,7 @@
   {
    "connector": {
     "id": "56c2608f-5435-4307-be85-96e6e63b792a",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:13342363-c3c6-469c-80b6-356397c95f53",
@@ -399,7 +399,7 @@
   {
    "connector": {
     "id": "2459e6c7-1c76-4d21-968f-d882f512d53b",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:098774e6-f5a6-4fa0-b3cc-a195761bd957",
@@ -411,7 +411,7 @@
   {
    "connector": {
     "id": "a46e659d-0687-4f77-8948-3e09f72d99c7",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:4acb8f1a-23ab-474b-9571-8ab12f5aef41",
@@ -423,7 +423,7 @@
   {
    "connector": {
     "id": "7ce5dc21-e816-4e36-a8ee-29295a6ba454",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:ede16f1d-7795-4cbc-a605-ccfd25b7bb98",
@@ -435,7 +435,7 @@
   {
    "connector": {
     "id": "6e12e7e0-2fc6-444d-a1f2-16cea0d51eeb",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
@@ -447,7 +447,7 @@
   {
    "connector": {
     "id": "b19ab64b-c38d-490e-85be-d58547582144",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:c6fc141b-034f-42db-bb33-a2059731e990",
@@ -459,7 +459,7 @@
   {
    "connector": {
     "id": "b2d466cc-5250-4b8a-963e-bbd36f07380d",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
@@ -473,7 +473,7 @@
   {
    "id": "92f64732-b166-4765-bb0d-3d36a566005a",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -481,10 +481,10 @@
   {
    "id": "7b6c5cb6-cd7f-43cb-bf69-37eff4e3200b",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6a6779e6]",
-    "unnest 3 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@2f74219d"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6a6779e6]",
+    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@2f74219d"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -492,45 +492,45 @@
   {
    "id": "9e589fcc-04fa-4834-ba1f-253470672434",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "ff24200a-c665-4ca3-baa8-09fd2ca0ae04",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "c6fc141b-034f-42db-bb33-a2059731e990",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "bb03494d-e0a9-4898-8b80-64c54da6a20c",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "4acb8f1a-23ab-474b-9571-8ab12f5aef41",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "19350ade-da75-4a1d-90e7-4f6753ef2732",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1]",
-    "unnest 3 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@6b6d2702"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1]",
+    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@6b6d2702"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -538,45 +538,45 @@
   {
    "id": "421e3891-f7b0-4a50-a1d0-5c82099823f2",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@4b1c2b67"],
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "micro-operators": ["unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@4b1c2b67"],
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "21db32ee-7d3e-42f5-9541-2145ef2e55e2",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "99f0eeb6-d9f2-4af1-9b1b-6f0df7870db8",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "0066c7f5-f720-4098-8908-bebee74a409d",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "b504c4ff-8226-43c2-b06f-a9ad59e54312",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "a14d6687-2c52-41f9-95ed-ab9f4b451180",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@26659db7]",
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@26659db7]",
     "stream-project [4]"
    ],
    "out-arity": 1,
@@ -585,7 +585,7 @@
   {
    "id": "f22b2397-d586-4894-8709-99da302fdc56",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["sink-write [0] outputFile"],
    "out-arity": 0,
    "type": "operator"
@@ -593,21 +593,21 @@
   {
    "id": "785d1650-a0b5-4f63-bfca-fe68d292c294",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "66f6f703-1a20-40b2-a3a3-514412cabb03",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "c66e50f0-f068-43fd-833e-32f9b6117f2f",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -615,10 +615,10 @@
   {
    "id": "1da790c0-ca3c-4833-8280-5c7c2d0ac23c",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
     "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [edu.uci.ics.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@59556d12]",
+    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@59556d12]",
     "assign [4] := [ConstantEvalFactory true]"
    ],
    "out-arity": 1,
@@ -627,7 +627,7 @@
   {
    "id": "13342363-c3c6-469c-80b6-356397c95f53",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -635,14 +635,14 @@
   {
    "id": "769e1d5c-5b5b-4437-8764-a6e0bcf8d210",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "da3da2a7-80c7-47a2-9d72-23b7c8f3d669",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -650,22 +650,22 @@
   {
    "id": "d966ca1f-a412-4b20-96cf-0b8b6c64df9c",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "baa3f1d6-1425-4180-a1de-2878f16e95d5",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
-   "micro-operators": ["unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"],
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "micro-operators": ["unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"],
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "6582beec-b6c0-48cc-ab7e-a5f3fc92bfa9",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -673,21 +673,21 @@
   {
    "id": "da4389d3-57a0-41fa-973b-cfdedca126d4",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "e0d76180-55c0-41db-9d4e-b0b80eed3922",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "36b24630-2bdf-47e2-ade4-21f95efde5a8",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -695,11 +695,11 @@
   {
    "id": "b1922618-827e-4276-a89e-5bd257cecd7d",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
-    "assign [3] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@1a0fced4]",
-    "unnest 4 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@3d3cdaa"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
+    "assign [3] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@1a0fced4]",
+    "unnest 4 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@3d3cdaa"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -707,25 +707,25 @@
   {
    "id": "93596e19-b912-4071-94a9-512133274499",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "c49457b9-a4be-48d2-8e82-50820e0ca618",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "7d6eb230-0efc-42a7-b279-98e0258073e6",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@466355dc]",
-    "assign [3] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@239a029e]",
-    "unnest 4 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@5421e554"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@466355dc]",
+    "assign [3] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@239a029e]",
+    "unnest 4 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@5421e554"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -733,14 +733,14 @@
   {
    "id": "098774e6-f5a6-4fa0-b3cc-a195761bd957",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "ac276d4f-0bd6-468e-b314-da000f9141ea",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["stream-project [3, 1]"],
    "out-arity": 1,
    "type": "operator"
@@ -748,10 +748,10 @@
   {
    "id": "066a993b-57b5-47ad-8a18-fef27b8e16f4",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [12] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@7d5718f2]",
-    "stream-select edu.uci.ics.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@6126f827"
+    "assign [12] := [org.apache.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@7d5718f2]",
+    "stream-select org.apache.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@6126f827"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -759,38 +759,38 @@
   {
    "id": "31c39bd3-6724-42bc-b15f-9331d434598f",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "0bdd825d-3c80-4769-95ec-3d8ed0fec67a",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "9c797900-e6cf-44ad-b5e3-869e56fd27ba",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "ede16f1d-7795-4cbc-a605-ccfd25b7bb98",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "9678a828-3e96-4391-be41-8da45721ca3d",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
     "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [edu.uci.ics.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@456dfa45]",
+    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@456dfa45]",
     "assign [4] := [ConstantEvalFactory true]"
    ],
    "out-arity": 1,
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json b/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json
index cca4f7a..6db2b99 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/fuzzy-join-aql.json
@@ -3,7 +3,7 @@
   {
    "connector": {
     "id": "9e451fd1-ca4d-44e7-9c01-5fd0bc520dfa",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
@@ -15,7 +15,7 @@
   {
    "connector": {
     "id": "d506b416-5ef6-4e79-ad8b-97d870b2e7fd",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:67d4cc31-c6fb-48d3-8ca3-af44628f68ca",
@@ -27,7 +27,7 @@
   {
    "connector": {
     "id": "0283040e-2cb1-48ce-8a12-3fd02e02a867",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:ce6dab26-9823-4e74-9834-914ab6798874",
@@ -39,7 +39,7 @@
   {
    "connector": {
     "id": "d3c6f04b-30b0-4eca-8666-d926559d2242",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
@@ -51,7 +51,7 @@
   {
    "connector": {
     "id": "27771271-9fd0-4e54-b864-ec0241e06350",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:40fc40ba-d7e5-44a2-a9a6-88642a2e2f79",
@@ -63,7 +63,7 @@
   {
    "connector": {
     "id": "798874c1-f95e-4534-8944-fb04dd5c5d9d",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:61e21faf-53be-44c7-a39b-d621a19b3dc6",
@@ -75,7 +75,7 @@
   {
    "connector": {
     "id": "dd64cb43-3d38-488c-90df-6703049dcbed",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:86cf6620-ce7a-447d-82ac-32d71720d008",
@@ -87,7 +87,7 @@
   {
    "connector": {
     "id": "b4eab7c7-58a5-4908-b117-f6a455cf28df",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:899fc36b-024c-402f-a155-a218dc3358ee",
@@ -99,7 +99,7 @@
   {
    "connector": {
     "id": "92abc733-323e-4fc4-a0d3-574f1a2380b9",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:f0024d8c-b182-4c84-9642-562b7f873cb1",
@@ -111,7 +111,7 @@
   {
    "connector": {
     "id": "a442c8f4-dbe3-4549-8116-fabf2133cb37",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:939559d4-4753-42ca-a96b-5a4d867521e4",
@@ -123,7 +123,7 @@
   {
    "connector": {
     "id": "7561fed7-fe79-4f41-a0c7-fe3038cd4df8",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:649b70fe-e549-4f38-b248-1868bf691b87",
@@ -135,7 +135,7 @@
   {
    "connector": {
     "id": "436185ad-9c58-43d3-b654-d4279a41d3ca",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:11496054-b3b3-4730-b43a-7130c474ef1f",
@@ -147,7 +147,7 @@
   {
    "connector": {
     "id": "5fcce470-62bb-4415-b970-feb258ceb126",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:2c7f5446-ca70-424e-b72b-dcbfba13c5fc",
@@ -159,7 +159,7 @@
   {
    "connector": {
     "id": "f07cdaf4-448b-452d-8340-16c2836e950a",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:a80baf03-e23a-4e51-828a-b9ec8620767b",
@@ -171,7 +171,7 @@
   {
    "connector": {
     "id": "aeab0d67-4610-4190-a116-a0d592bfbc76",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:bd489957-baec-4872-9b64-6ce7ecc36ed1",
@@ -183,7 +183,7 @@
   {
    "connector": {
     "id": "6681661c-aa41-4fe3-8c05-4e77910babc3",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:7e45e056-61c7-47a0-a5d0-5e145b48b64b",
@@ -195,7 +195,7 @@
   {
    "connector": {
     "id": "83d3048b-5b1e-4835-aaa0-ab6f9bca2cac",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:55442d10-e749-4178-99e7-c29d40c980d1",
@@ -207,7 +207,7 @@
   {
    "connector": {
     "id": "43aabbac-532e-4bf5-88c1-adf115c4e5ef",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:6cc231d4-a25c-4301-98f9-3a9dd548a635",
@@ -219,7 +219,7 @@
   {
    "connector": {
     "id": "2c5b8681-b3d6-43e4-9a43-b662626231ff",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:019d92ce-5cb6-4ed4-a55b-5088b1298356",
@@ -231,7 +231,7 @@
   {
    "connector": {
     "id": "448a4dcf-989b-455a-b8db-37fd73633a08",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:84042597-2ad3-41fd-95be-7c7a8c9ba6e7",
@@ -243,7 +243,7 @@
   {
    "connector": {
     "id": "08d1bec0-36f2-42d5-a8c7-1d07f993dfe0",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:162900ff-b4a6-4d0c-b9c2-6595f9d11e4e",
@@ -255,7 +255,7 @@
   {
    "connector": {
     "id": "0bddc12e-bcbb-4993-8d32-b657505305fc",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:6a50b453-2460-4ee8-8fc4-9855ecb54862",
@@ -267,7 +267,7 @@
   {
    "connector": {
     "id": "e066c3c9-3a65-46ae-ab78-417c872d8482",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
@@ -279,7 +279,7 @@
   {
    "connector": {
     "id": "63433aaf-1046-48ca-8bce-ddb9e645aaaf",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:73e52bad-0cff-4d55-b95b-176b16f7f464",
@@ -291,7 +291,7 @@
   {
    "connector": {
     "id": "3194b91e-6df6-47c2-86f9-e933849a1d51",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:4c0306ed-84f7-4dd8-987c-a800d925505a",
@@ -303,7 +303,7 @@
   {
    "connector": {
     "id": "2d0cbb34-5d09-4924-b7d7-d754578d369b",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNReplicatingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:34bea0d2-8c02-46af-a281-d359e73e8459",
@@ -315,7 +315,7 @@
   {
    "connector": {
     "id": "061b01cf-dd3d-4e4a-b4d1-2e55430b7eff",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:fe17ac32-aa06-4273-bfeb-6ad12004146d",
@@ -327,7 +327,7 @@
   {
    "connector": {
     "id": "c74fdcf7-75b1-469f-aa4f-bdeec91ea356",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:470b4218-4ff6-4699-b05d-d5624f70c346",
@@ -339,7 +339,7 @@
   {
    "connector": {
     "id": "8742990b-c6b3-43f5-84e4-22df1a61d7c6",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:800cab7e-8228-4c85-b19a-39cb844893b7",
@@ -351,7 +351,7 @@
   {
    "connector": {
     "id": "6d59eadb-3286-49f0-80d6-d7ad9d4247a3",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:ad75356e-262b-468d-ad27-5ead6cfa49b3",
@@ -363,7 +363,7 @@
   {
    "connector": {
     "id": "b400c160-9fca-4151-a5a1-2387da980702",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:f323df6e-1caa-4cb2-9c2c-903df08ee288",
@@ -375,7 +375,7 @@
   {
    "connector": {
     "id": "807b4c5d-ac3f-49e2-a65a-e58348346e49",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:fe400283-741d-4b35-bc79-9e430715f3fb",
@@ -387,7 +387,7 @@
   {
    "connector": {
     "id": "6555a4da-7164-40c7-9c11-ce6bb098e1bd",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:cf5387c0-3490-4c50-b47e-ac20c5e961a7",
@@ -399,7 +399,7 @@
   {
    "connector": {
     "id": "90ee0791-9c0e-47e8-832d-8344d8f4c36f",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:3796886b-044c-4bfd-b682-9c3a2df05f31",
@@ -411,7 +411,7 @@
   {
    "connector": {
     "id": "0c93505b-ac0f-4485-98dd-ad1310c8a8af",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:8e7bd09e-3fe2-4022-b493-64320be10f22",
@@ -423,7 +423,7 @@
   {
    "connector": {
     "id": "dfac2841-28bd-4d2c-be58-60e800885ecb",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:5f398745-a0da-4a93-8654-add2e550003c",
@@ -435,7 +435,7 @@
   {
    "connector": {
     "id": "58da74ca-aa5a-4d1c-95a1-46a17239430b",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:c29fedec-a107-4d03-822b-5f08d44fbfc2",
@@ -447,7 +447,7 @@
   {
    "connector": {
     "id": "b58210fa-978c-434f-8417-12fba92a25a9",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.MToNHashPartitioningMergingConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:97f7b483-5810-4f62-a3f2-8dc108f211bf",
@@ -459,7 +459,7 @@
   {
    "connector": {
     "id": "b7081523-098e-47bd-8b86-27d8d7c4c199",
-    "java-class": "edu.uci.ics.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
+    "java-class": "org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor",
     "type": "connector"
    },
    "in-operator-id": "ODID:17c0bf1d-edab-423b-a932-23d1c3111b0e",
@@ -473,7 +473,7 @@
   {
    "id": "939559d4-4753-42ca-a96b-5a4d867521e4",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -481,14 +481,14 @@
   {
    "id": "97f7b483-5810-4f62-a3f2-8dc108f211bf",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "bd489957-baec-4872-9b64-6ce7ecc36ed1",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["stream-project [1, 3]"],
    "out-arity": 1,
    "type": "operator"
@@ -496,10 +496,10 @@
   {
    "id": "2c7f5446-ca70-424e-b72b-dcbfba13c5fc",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3a747fa2]",
-    "unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@366782a9"
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3a747fa2]",
+    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@366782a9"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -507,7 +507,7 @@
   {
    "id": "8e7bd09e-3fe2-4022-b493-64320be10f22",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -515,7 +515,7 @@
   {
    "id": "61e21faf-53be-44c7-a39b-d621a19b3dc6",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -523,11 +523,11 @@
   {
    "id": "c29fedec-a107-4d03-822b-5f08d44fbfc2",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2, 3] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@45b34126, edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@7b7a4989]",
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@197200b4]",
-    "unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@b8c3679"
+    "assign [2, 3] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@45b34126, org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@7b7a4989]",
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@197200b4]",
+    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@b8c3679"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -535,7 +535,7 @@
   {
    "id": "dde20475-0341-40cd-8d87-47019d4af7e7",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["sink-write [0] outputFile"],
    "out-arity": 0,
    "type": "operator"
@@ -543,28 +543,28 @@
   {
    "id": "83b6ee56-1fba-4df7-bd13-89de2edfc4dc",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "019d92ce-5cb6-4ed4-a55b-5088b1298356",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "6cc231d4-a25c-4301-98f9-3a9dd548a635",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "470b4218-4ff6-4699-b05d-d5624f70c346",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -572,49 +572,49 @@
   {
    "id": "fe17ac32-aa06-4273-bfeb-6ad12004146d",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "ce6dab26-9823-4e74-9834-914ab6798874",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "cf5387c0-3490-4c50-b47e-ac20c5e961a7",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "86cf6620-ce7a-447d-82ac-32d71720d008",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.PreclusteredGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "84042597-2ad3-41fd-95be-7c7a8c9ba6e7",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "f0024d8c-b182-4c84-9642-562b7f873cb1",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "3796886b-044c-4bfd-b682-9c3a2df05f31",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -622,23 +622,23 @@
   {
    "id": "649b70fe-e549-4f38-b248-1868bf691b87",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "a80baf03-e23a-4e51-828a-b9ec8620767b",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "34bea0d2-8c02-46af-a281-d359e73e8459",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@224c47db]",
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.AbstractRecordConstructorDescriptor$1@224c47db]",
     "stream-project [4]"
    ],
    "out-arity": 1,
@@ -647,21 +647,21 @@
   {
    "id": "800cab7e-8228-4c85-b19a-39cb844893b7",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "094cb8b2-df6d-4f73-a8f5-00a6ce14d59b",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "17c0bf1d-edab-423b-a932-23d1c3111b0e",
    "in-arity": 0,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": ["ets"],
    "out-arity": 1,
    "type": "operator"
@@ -669,10 +669,10 @@
   {
    "id": "11496054-b3b3-4730-b43a-7130c474ef1f",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [12] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@3e018c74]",
-    "stream-select edu.uci.ics.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@57ac3379"
+    "assign [12] := [org.apache.asterix.runtime.evaluators.tagged.functions.SimilarityDescriptor$1@3e018c74]",
+    "stream-select org.apache.asterix.runtime.evaluators.comparisons.ComparisonEvalFactory@57ac3379"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -680,10 +680,10 @@
   {
    "id": "fe400283-741d-4b35-bc79-9e430715f3fb",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
     "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [edu.uci.ics.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@6a6779e6]",
+    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@6a6779e6]",
     "assign [4] := [ConstantEvalFactory true]"
    ],
    "out-arity": 1,
@@ -692,24 +692,24 @@
   {
    "id": "73e52bad-0cff-4d55-b95b-176b16f7f464",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "f323df6e-1caa-4cb2-9c2c-903df08ee288",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "899fc36b-024c-402f-a155-a218dc3358ee",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
     "assign [2] := [ColumnAccess(0)]",
-    "running-aggregate [3] := [edu.uci.ics.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@2f74219d]",
+    "running-aggregate [3] := [org.apache.asterix.runtime.runningaggregates.std.TidRunningAggregateDescriptor$1@2f74219d]",
     "assign [4] := [ConstantEvalFactory true]"
    ],
    "out-arity": 1,
@@ -718,32 +718,32 @@
   {
    "id": "b07bbb40-a41c-4d00-994b-f5fa5d3eca34",
    "in-arity": 2,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.join.InMemoryHashJoinOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "ad75356e-262b-468d-ad27-5ead6cfa49b3",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "40fc40ba-d7e5-44a2-a9a6-88642a2e2f79",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "6a50b453-2460-4ee8-8fc4-9855ecb54862",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2, 3] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1, edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6b6d2702]",
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@4b1c2b67]",
-    "unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@26659db7"
+    "assign [2, 3] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@714ae2c1, org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@6b6d2702]",
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.functions.LenDescriptor$1@4b1c2b67]",
+    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@26659db7"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -751,24 +751,24 @@
   {
    "id": "5f398745-a0da-4a93-8654-add2e550003c",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "55442d10-e749-4178-99e7-c29d40c980d1",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
+   "java-class": "org.apache.hyracks.dataflow.std.group.HashGroupOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "162900ff-b4a6-4d0c-b9c2-6595f9d11e4e",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [4] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@59556d12]",
-    "unnest 5 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"
+    "assign [4] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@59556d12]",
+    "unnest 5 <- org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescriptor$1@776be68f"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -776,10 +776,10 @@
   {
    "id": "67d4cc31-c6fb-48d3-8ca3-af44628f68ca",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
-    "unnest 3 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@1a0fced4"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@4cedf389]",
+    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@1a0fced4"
    ],
    "out-arity": 1,
    "type": "operator"
@@ -787,17 +787,17 @@
   {
    "id": "7e45e056-61c7-47a0-a5d0-5e145b48b64b",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
+   "java-class": "org.apache.hyracks.storage.am.btree.dataflow.BTreeSearchOperatorDescriptor",
    "out-arity": 1,
    "type": "operator"
   },
   {
    "id": "4c0306ed-84f7-4dd8-987c-a800d925505a",
    "in-arity": 1,
-   "java-class": "edu.uci.ics.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
+   "java-class": "org.apache.aqua.runtime.operators.base.AquaMetaOperatorDescriptor",
    "micro-operators": [
-    "assign [2] := [edu.uci.ics.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3d3cdaa]",
-    "unnest 3 <- edu.uci.ics.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@466355dc"
+    "assign [2] := [org.apache.asterix.runtime.evaluators.tagged.FieldAccessByNameEvalFactory@3d3cdaa]",
+    "unnest 3 <- org.apache.asterix.runtime.unnestingfunctions.std.ScanCollectionDescriptor$1@466355dc"
    ],
    "out-arity": 1,
    "type": "operator"