diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql
index 9e7e50c..8a77067 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.1.ddl.aql
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql
index aa59e11..ba7fc30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.2.update.aql
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql
index a6e3185..e67a7f6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/opentype-insert2/opentype-insert2.3.query.aql
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/RecordsQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml
similarity index 80%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/RecordsQueries.xml
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml
index 60ee26c..d558c66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/RecordsQueries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/ObjectsQueries.xml
@@ -23,18 +23,18 @@
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_01">
-      <output-dir compare="Text">closed-record-constructor_01</output-dir>
+    <compilation-unit name="closed-object-constructor_01">
+      <output-dir compare="Text">closed-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_02">
-      <output-dir compare="Text">closed-record-constructor_02</output-dir>
+    <compilation-unit name="closed-object-constructor_02">
+      <output-dir compare="Text">closed-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_03">
-      <output-dir compare="Text">closed-record-constructor_03</output-dir>
+    <compilation-unit name="closed-object-constructor_03">
+      <output-dir compare="Text">closed-object-constructor_03</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
@@ -52,64 +52,64 @@
       <output-dir compare="Text">field-access-on-open-field</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <!--test-case FilePath="records/get-record-fields">
+  <!--test-case FilePath="records/get-object-fields">
       <compilation-unit name="tiny-social-example">
           <output-dir compare="Text">tiny-social-example</output-dir>
       </compilation-unit>
   </test-case!-->
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-no-complex-types">
       <output-dir compare="Text">tiny-social-example-no-complex-types</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-only-lists">
       <output-dir compare="Text">tiny-social-example-only-lists</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-closed">
       <output-dir compare="Text">highly-nested-closed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-mixed">
       <output-dir compare="Text">highly-nested-mixed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="tiny-social-example">
       <output-dir compare="Text">tiny-social-example</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="open-record-constructor_01">
-      <output-dir compare="Text">open-record-constructor_01</output-dir>
+    <compilation-unit name="open-object-constructor_01">
+      <output-dir compare="Text">open-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="open-record-constructor_02">
-      <output-dir compare="Text">open-record-constructor_02</output-dir>
+    <compilation-unit name="open-object-constructor_02">
+      <output-dir compare="Text">open-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
@@ -131,47 +131,47 @@
     </compilation-unit>
   </test-case>
   <!-- RECORD MANIPULATION TESTS -->
-  <test-case FilePath="records/record-merge">
+  <test-case FilePath="records/object-merge">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-merge">
+  <test-case FilePath="records/object-merge">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-merge">
+  <test-case FilePath="records/object-merge">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-add-fields">
+  <test-case FilePath="records/object-add-fields">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-add-fields">
+  <test-case FilePath="records/object-add-fields">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-add-fields">
+  <test-case FilePath="records/object-add-fields">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-remove-fields">
+  <test-case FilePath="records/object-remove-fields">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-remove-fields">
+  <test-case FilePath="records/object-remove-fields">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/record-remove-fields">
+  <test-case FilePath="records/object-remove-fields">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.10.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.10.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.10.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.10.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.11.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.11.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.11.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.11.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.12.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.12.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.12.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.12.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.4.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.4.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.5.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.5.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.5.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.6.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.6.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.6.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.7.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.7.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.7.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.8.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.8.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.8.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.9.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/access-nested-fields/access-nested-fields.9.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/access-nested-fields/access-nested-fields.9.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-nullable-fields_issue1616/closed-nullable-fileds_issue1616.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.aql
similarity index 92%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.aql
index 334da01..1c32906 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_01/closed-record-constructor_01.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.aql
@@ -19,4 +19,4 @@
 use dataverse test;
 set import-private-functions 'true';
 
-closed-record-constructor("foo1", 10, "bar1", 20, "foo2", 30, "bar2", 40)
+closed-object-constructor("foo1", 10, "bar1", 20, "foo2", 30, "bar2", 40)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.aql
index 7e5d85c..7246866 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_02/closed-record-constructor_02.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.aql
@@ -19,4 +19,4 @@
 use dataverse test;
 set import-private-functions 'true';
 
-closed-record-constructor("foo1", 10, "bar1", closed-record-constructor("bar1.1", 10, "bar1.2", 20, "bar1.3", 30, "bar1.4", closed-record-constructor("bar1.4.1", 10, "bar1.4.2", 20, "bar1.4.3", 30, "bar1.4.4", 40), "foo2", 30, "bar2", 40), "foo2", 30, "bar2", 40)
+closed-object-constructor("foo1", 10, "bar1", closed-object-constructor("bar1.1", 10, "bar1.2", 20, "bar1.3", 30, "bar1.4", closed-object-constructor("bar1.4.1", 10, "bar1.4.2", 20, "bar1.4.3", 30, "bar1.4.4", 40), "foo2", 30, "bar2", 40), "foo2", 30, "bar2", 40)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/closed-record-constructor_03/closed-record-constructor_03.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/closed-object-constructor_03/closed-record-constructor_03.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/expFieldName/expFieldName.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/expFieldName/expFieldName.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-by-index_01/field-access-by-index_01.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-by-index_01/field-access-by-index_01.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/field-access-on-open-field/field-access-on-open-field.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/field-access-on-open-field/field-access-on-open-field.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.1.query.aql
similarity index 89%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.1.query.aql
index f9aecdc..1878e27 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.1.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB", 
             "address":{"city":"Irvine", "state":"CA"}, 
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return get-record-fields($r1)
+        return get-object-field-value($r1, "project")
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.2.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.1.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.2.query.aql
index 14167c9..96d0394 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.2.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB", 
             "address":{"city":"Irvine", "state":"CA"}, 
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return get-record-field-value($r1, "project")
+        return get-object-field-value($r1, "address")
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.3.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.3.query.aql
index b1841c0..3a5b8ed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/documentation-example/documentation-example.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
             "project": "AsterixDB", 
             "address": { "city": "Irvine", "state": "CA" }, 
             "related": [ "Hivestrix", "Preglix", "Apache VXQuery" ] }
-        return get-record-field-value($r1, "related")
+        return get-object-field-value($r1, "related")
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql
index 178ac05..cac4146 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.aql
similarity index 93%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.aql
index 430bf81..e676df1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.aql
index d9c8d6e..27bd83b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.aql
@@ -17,13 +17,13 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse test;
 
 for $test in dataset Animals
-let $result := get-record-field-value($test, "class")
+let $result := get-object-field-value($test, "class")
 order by $result.id
 return $result;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql
index 665ba28..a85ba82 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql
index 430bf81..e676df1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql
index d9c8d6e..27bd83b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql
@@ -17,13 +17,13 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse test;
 
 for $test in dataset Animals
-let $result := get-record-field-value($test, "class")
+let $result := get-object-field-value($test, "class")
 order by $result.id
 return $result;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.aql
index fdd1203..7724802 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.aql
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.aql
index 430bf81..e676df1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.aql
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.aql
index d9c8d6e..27bd83b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.aql
@@ -17,13 +17,13 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse test;
 
 for $test in dataset Animals
-let $result := get-record-field-value($test, "class")
+let $result := get-object-field-value($test, "class")
 order by $result.id
 return $result;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.aql
index a501a34..ab2ef4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.aql
index 7382413..f3c06ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.aql
index b89a3a4..905a815 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.aql
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.aql
index 6b21f45..d8dd0a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.aql
@@ -17,15 +17,15 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessages
-for $f in get-record-fields($r)
+for $f in get-object-fields($r)
 where $f.field-type = "STRING"
-let $result := get-record-field-value($r, $f.field-name)
+let $result := get-object-field-value($r, $f.field-name)
 order by $result
 return $result
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/documentation-example/documentation-example.1.query.aql
similarity index 91%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/documentation-example/documentation-example.1.query.aql
index f9aecdc..d742a23 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/documentation-example/documentation-example.1.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB", 
             "address":{"city":"Irvine", "state":"CA"}, 
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return get-record-fields($r1)
+        return get-object-fields($r1)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql
index 934865b..0f81011 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql
index 6c9f87e..4a07802 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql
index 7f9e608..9500273 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
index 2f208e5..0e983af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $user in dataset FacebookUsersAlternate
 where $user.id = 8
-return get-record-fields($user);
+return get-object-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
index 6e968a2..7cc3e77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookUsersAlternate
 order by $r.id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
index 00ca768..48af631 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookMessagesAlternate
 order by $r.message-id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
index 684407d..fe35a9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TwitterUsersAlternate
 order by $r.screen-name
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
index ae89bb6..fe44f88 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TweetMessagesAlternate
 order by $r.tweetid
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql
similarity index 91%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql
index cfeefa4..5254a61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.aql
@@ -17,14 +17,14 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessagesAlternate
-  for $f in get-record-fields($r)
+  for $f in get-object-fields($r)
     group by $n:=$f.field-name, $t:=$f.field-type with $r
     let $count:=count($r)
     order by $n, $t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql
index d14ae15..c04cdb4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql
index 6c9f87e..4a07802 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql
index 5d8a0cc..da0549b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql
index 2f208e5..0e983af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $user in dataset FacebookUsersAlternate
 where $user.id = 8
-return get-record-fields($user);
+return get-object-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql
index 6e968a2..7cc3e77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookUsersAlternate
 order by $r.id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql
index 00ca768..48af631 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookMessagesAlternate
 order by $r.message-id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql
index 684407d..fe35a9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TwitterUsersAlternate
 order by $r.screen-name
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql
index ae89bb6..fe44f88 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TweetMessagesAlternate
 order by $r.tweetid
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
similarity index 91%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
index 20f8745..1cd6b77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
@@ -17,14 +17,14 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessagesAlternate
-for $f in get-record-fields($r)
+for $f in get-object-fields($r)
 group by $n:=$f.field-name, $t:=$f.field-type with $r
 let $count:=count($r)
 order by $n, $t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql
index b3207f0..d1755e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql
index 6c9f87e..4a07802 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql
index bc85b2d..71e5abe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql
index 2f208e5..0e983af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $user in dataset FacebookUsersAlternate
 where $user.id = 8
-return get-record-fields($user);
+return get-object-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql
index 6e968a2..7cc3e77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookUsersAlternate
 order by $r.id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql
index 00ca768..48af631 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookMessagesAlternate
 order by $r.message-id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql
index 684407d..fe35a9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TwitterUsersAlternate
 order by $r.screen-name
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql
index ae89bb6..fe44f88 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TweetMessagesAlternate
 order by $r.tweetid
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql
similarity index 91%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql
index 20f8745..1cd6b77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql
@@ -17,14 +17,14 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessagesAlternate
-for $f in get-record-fields($r)
+for $f in get-object-fields($r)
 group by $n:=$f.field-name, $t:=$f.field-type with $r
 let $count:=count($r)
 order by $n, $t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.aql
index be914e1..ddae183 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.aql
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.aql
index 7382413..c3d40c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.aql
index a68f622..b220f4f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.aql
index 1e9d420..b219997 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $user in dataset FacebookUsers
 where $user.id = 8
-return get-record-fields($user);
+return get-object-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.aql
index 442055e..e9a5e57 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookUsers
 order by $r.id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.aql
index 074d29a..ec50113 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset FacebookMessages
 order by $r.message-id
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.aql
index d70b007..f015455 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TwitterUsers
 order by $r.screen-name
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.aql
index 2814979..d2e3955 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,4 +25,4 @@
 
 for $r in dataset TweetMessages
 order by $r.tweetid
-return get-record-fields($r);
+return get-object-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.aql
similarity index 91%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.aql
index 04c0d62..aa9b8e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.aql
@@ -17,14 +17,14 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessages
-for $f in get-record-fields($r)
+for $f in get-object-fields($r)
 group by $n:=$f.field-name, $t:=$f.field-type with $r
 let $count:=count($r)
 order by $n, $t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.1.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.1.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.1.query.aql
index 5e76429..b61eb95 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.1.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-add-fields($r1, [{"field-name":"employment-location", "field-value":create-point(30.0,70.0)}])
+        return object-add-fields($r1, [{"field-name":"employment-location", "field-value":create-point(30.0,70.0)}])
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.2.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.2.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.2.query.aql
index 856aed2..a42c7da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.2.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.2.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-add-fields($r1, [{"field-name":"employment-type", "field-value":"visitor"}])
\ No newline at end of file
+        return object-add-fields($r1, [{"field-name":"employment-type", "field-value":"visitor"}])
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.3.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.3.query.aql
index aad677b..c28d00b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/documentation-example/documentation-example.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/documentation-example/documentation-example.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-add-fields($r1, [{"field-name":"employment-years", "field-value":2}])
+        return object-add-fields($r1, [{"field-name":"employment-years", "field-value":2}])
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql
index d850caa..6d6a7ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.2.update.aql
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.2.update.aql
index d96edf0..c4b6997 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.3.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.3.query.aql
index fb937e4..e117716 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/highly-nested-open/highly-nested-open.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,6 +25,6 @@
 
 let $rec:=[{"field-name":"animal-info", "field-value":"Test information"}]
 for $test in dataset Animals
-let $result := record-add-fields($test, $rec)
+let $result := object-add-fields($test, $rec)
 order by $result.id
 return $result;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
index 5aedc05..3f4ef83 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql
index 97ee993..ca2ceee 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql
@@ -17,10 +17,11 @@
  * under the License.
  */
 /*
-* Description  : Testing record-merge under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
+
 use dataverse TinySocial;
 
 create dataset FacebookUsers(FacebookUserType)
@@ -39,4 +40,4 @@
 create index fbUserSinceIdx on FacebookUsers(user-since);
 create index fbAuthorIdx on FacebookMessages(author-id) type btree;
 create index fbSenderLocIndex on FacebookMessages(sender-location) type rtree;
-create index fbMessageIdx on FacebookMessages(message) type keyword;
+create index fbMessageIdx on FacebookMessages(message) type keyword;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.3.update.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.3.update.aql
index 80f1615..9e1d3e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.4.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.4.query.aql
index ec7c77d..321aded 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-add-fields/tiny-social-example/tiny-social-example.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-add-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,6 +25,6 @@
 
 for $r in dataset TweetMessages
 for $f in dataset FacebookMessages
-let $result := record-add-fields($r, [{"field-name":"fb-author-id", "field-value":$f.author-id}])
+let $result := object-add-fields($r, [{"field-name":"fb-author-id", "field-value":$f.author-id}])
 order by $result
 return $result
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.1.query.aql
similarity index 92%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.1.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.1.query.aql
index 7abb690..43cdf47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.1.query.aql
@@ -17,12 +17,12 @@
  * under the License.
  */
 /*
-* Description  : record-merge under different queries.
+* Description  : object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
 let $r1 := {"id":1, "project":"AsterixDB",
 "address":{"city":"Irvine", "state":"CA"}, "related":["Hivestrix", "Preglix", "Apache VXQuery"]}
 let $r2 := {"user_id": 22, "employer": "UC Irvine", "employment-type": "visitor" }
-let $result := record-merge($r1, $r2)
+let $result := object-merge($r1, $r2)
 return $result
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.2.query.aql
similarity index 92%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.2.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.2.query.aql
index 137cdfb..f147e68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.2.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.2.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : record-merge under different queries.
+* Description  : object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -29,4 +29,4 @@
         let $r2 := {"user_id": 22,
               "employer": "UC Irvine",
               "employment-location": create-point(30.0,70.0) }
-        return  record-merge($r1, $r2)
\ No newline at end of file
+        return  object-merge($r1, $r2)
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.3.query.aql
similarity index 92%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.3.query.aql
index 92ee00f..a46c9de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/documentation-example/documentation-example.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/documentation-example/documentation-example.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : record-merge under different queries.
+* Description  : object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -29,4 +29,4 @@
         let $r2 := {"user_id": 22,
               "employer": "UC Irvine",
               "address":{"city":"Irvine", "state":"CA"} }
-        return  record-merge($r1, $r2)
+        return  object-merge($r1, $r2)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.1.ddl.aql
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.1.ddl.aql
index d850caa..c543402 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.2.update.aql
similarity index 93%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.2.update.aql
index d96edf0..130d17f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.3.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.3.query.aql
index 70a3ad5..73ad03f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/highly-nested-open/highly-nested-open.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-merge under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,6 +25,6 @@
 
 let $rec:={"animal-info": "Test information"}
 for $test in dataset Animals
-let $result := record-merge($test, $rec)
+let $result := object-merge($test, $rec)
 order by $result.id
 return $result;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.1.ddl.aql
similarity index 96%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.1.ddl.aql
index 5aedc05..c25a27d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.1.ddl.aql
@@ -17,11 +17,10 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
-
 drop dataverse TinySocial if exists;
 create dataverse TinySocial;
 use dataverse TinySocial;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.2.ddl.aql
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.2.ddl.aql
index 97ee993..eb50feb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-merge under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.3.update.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.3.update.aql
index 5bc4f5c..cc1d457 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-merge under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.4.query.aql
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.4.query.aql
index 8601155..d47df97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-merge/tiny-social-example/tiny-social-example.4.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-merge under different queries.
+* Description  : Testing object-merge under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,6 +25,6 @@
 
 for $r in dataset TweetMessages
 for $f in dataset FacebookMessages
-let $result := record-merge($r, $f)
+let $result := object-merge($r, $f)
 order by $result
 return $result
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.1.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.1.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.1.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.1.query.aql
index 9ff79ac..6a995c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.1.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.1.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : record-remove-fields under different queries.
+* Description  : object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-remove-fields($r1, ["project"])
+        return object-remove-fields($r1, ["project"])
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.2.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.2.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.2.query.aql
index 7600912..d8e0a17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.2.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.2.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : record-remove-fields under different queries.
+* Description  : object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-remove-fields($r1, [["address", "city"]])
\ No newline at end of file
+        return object-remove-fields($r1, [["address", "city"]])
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.3.query.aql
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.3.query.aql
index 9409891..d53f56f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/documentation-example/documentation-example.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/documentation-example/documentation-example.3.query.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : record-remove-fields under different queries.
+* Description  : object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
@@ -25,4 +25,4 @@
             "project":"AsterixDB",
             "address":{"city":"Irvine", "state":"CA"},
             "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return record-remove-fields($r1, [["address", "state"], ["address", "city"]])
\ No newline at end of file
+        return object-remove-fields($r1, [["address", "state"], ["address", "city"]])
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
index d850caa..c56a332 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.1.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
index d96edf0..d1d0466 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.2.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.3.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.3.query.aql
index af8c258..b319b81 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/highly-nested-open/highly-nested-open.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/highly-nested-open/highly-nested-open.3.query.aql
@@ -17,13 +17,13 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
 use dataverse test;
 
 for $test in dataset Animals
-let $result := record-remove-fields($test, [["class", "fullClassification"]])
+let $result := object-remove-fields($test, [["class", "fullClassification"]])
 order by $result.id
 return $result;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql
similarity index 96%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql
index 5aedc05..8a9981e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql
@@ -17,11 +17,10 @@
  * under the License.
  */
 /*
-* Description  : Testing record-add-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
-
 drop dataverse TinySocial if exists;
 create dataverse TinySocial;
 use dataverse TinySocial;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql
index d9e2569..8bebdd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.2.ddl.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.3.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.3.update.aql
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.3.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.3.update.aql
index 542b97e..515288f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.3.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.3.update.aql
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.4.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.4.query.aql
index 42ab667..d3a4118 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/object-remove-fields/tiny-social-example/tiny-social-example.4.query.aql
@@ -17,13 +17,13 @@
  * under the License.
  */
 /*
-* Description  : Testing record-remove-fields under different queries.
+* Description  : Testing object-remove-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Aug 2015
 */
 use dataverse TinySocial;
 
 for $r in dataset TweetMessages
-let $result := record-remove-fields($r, ["sender-location", ["user", "screen-name"]])
+let $result := object-remove-fields($r, ["sender-location", ["user", "screen-name"]])
 order by $result
 return $result
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.3.query.aql
similarity index 92%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.3.query.aql
index 265f512..04fdde1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_01/open-record-constructor_01.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_01/open-record-constructor_01.3.query.aql
@@ -19,4 +19,4 @@
 use dataverse test;
 set import-private-functions 'true';
 
-open-record-constructor("foo1", 10, "bar1", 20, "foo2", 30, "bar2", 40)
+open-object-constructor("foo1", 10, "bar1", 20, "foo2", 30, "bar2", 40)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.3.query.aql
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.3.query.aql
index 1a1074b..6205fe0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-record-constructor_02/open-record-constructor_02.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-object-constructor_02/open-record-constructor_02.3.query.aql
@@ -19,4 +19,4 @@
 use dataverse test;
 set import-private-functions 'true';
 
-open-record-constructor("foo1", 10, "bar1", closed-record-constructor("bar1.1", 10, "bar1.2", 20, "bar1.3", 30, "bar1.4", closed-record-constructor("bar1.4.1", 10, "bar1.4.2", 20, "bar1.4.3", 30, "bar1.4.4", 40), "foo2", 30, "bar2", 40), "foo2", 30, "bar2", 40)
+open-object-constructor("foo1", 10, "bar1", closed-object-constructor("bar1.1", 10, "bar1.2", 20, "bar1.3", 30, "bar1.4", closed-object-constructor("bar1.4.1", 10, "bar1.4.2", 20, "bar1.4.3", 30, "bar1.4.4", 40), "foo2", 30, "bar2", 40), "foo2", 30, "bar2", 40)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.aql
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.2.query.aql
deleted file mode 100644
index 7f7848e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/documentation-example/documentation-example.2.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-        let $r1 := {"id":1, 
-            "project":"AsterixDB", 
-            "address":{"city":"Irvine", "state":"CA"}, 
-            "related":["Hivestrix", "Preglix", "Apache VXQuery"] }
-        return get-record-field-value($r1, "address")
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql
deleted file mode 100644
index 430bf81..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse test;
-
-load dataset Animals using localfs
-(("path"="asterix_nc1://data/classifications/animals.adm"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql
deleted file mode 100644
index d9c8d6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse test;
-
-for $test in dataset Animals
-let $result := get-record-field-value($test, "class")
-order by $result.id
-return $result;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.aql
deleted file mode 100644
index 430bf81..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse test;
-
-load dataset Animals using localfs
-(("path"="asterix_nc1://data/classifications/animals.adm"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.aql
deleted file mode 100644
index d9c8d6e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse test;
-
-for $test in dataset Animals
-let $result := get-record-field-value($test, "class")
-order by $result.id
-return $result;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.aql
deleted file mode 100644
index 154df6a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key message-id;
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid
-hints(cardinality=100); 
-
-create index fbUserSinceIdx on FacebookUsers(user-since);
-create index fbAuthorIdx on FacebookMessages(author-id) type btree;
-create index fbSenderLocIndex on FacebookMessages(sender-location) type rtree;
-create index fbMessageIdx on FacebookMessages(message) type keyword;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql
deleted file mode 100644
index 2f208e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $user in dataset FacebookUsersAlternate
-where $user.id = 8
-return get-record-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql
deleted file mode 100644
index 6e968a2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset FacebookUsersAlternate
-order by $r.id
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql
deleted file mode 100644
index 00ca768..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset FacebookMessagesAlternate
-order by $r.message-id
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql
deleted file mode 100644
index 684407d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset TwitterUsersAlternate
-order by $r.screen-name
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql
deleted file mode 100644
index ae89bb6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset TweetMessagesAlternate
-order by $r.tweetid
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql
deleted file mode 100644
index 2f208e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $user in dataset FacebookUsersAlternate
-where $user.id = 8
-return get-record-fields($user);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql
deleted file mode 100644
index 6e968a2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset FacebookUsersAlternate
-order by $r.id
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql
deleted file mode 100644
index 00ca768..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset FacebookMessagesAlternate
-order by $r.message-id
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql
deleted file mode 100644
index 684407d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset TwitterUsersAlternate
-order by $r.screen-name
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql
deleted file mode 100644
index ae89bb6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset TweetMessagesAlternate
-order by $r.tweetid
-return get-record-fields($r);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql
deleted file mode 100644
index 20f8745..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-use dataverse TinySocial;
-
-for $r in dataset TweetMessagesAlternate
-for $f in get-record-fields($r)
-group by $n:=$f.field-name, $t:=$f.field-type with $r
-let $count:=count($r)
-order by $n, $t
-return {"field-name":$n, "field-type":$t, "count":$count};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql
deleted file mode 100644
index 94556f0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.1.ddl.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-add-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type S as open{
-    id: int64
-}
-
-create type GS as open{
-    id: int64,
-    Genus: string
-}
-
-create type FGS as open{
-    id: int64,
-    Family: string
-}
-
-create type OFGS as open{
-    id: int64,
-    Order: string
-}
-
-create type COFGS as open{
-    id: int64,
-    Class: string
-}
-
-create type PCOFGS as open{
-    id: int64,
-    Phylum: string
-}
-
-create type KPCOFGS as open{
-    id: int64,
-    Kingdom: string
-}
-
-create type Classification as open{
-    id: int64
-}
-
-create type Animal as open{
-    id: int64
-}
-
-create dataset Animals(Animal)
-primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.2.update.aql
deleted file mode 100644
index cab8eb7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/highly-nested-open/highly-nested-open.2.update.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-add-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-use dataverse test;
-
-load dataset Animals using localfs
-(("path"="asterix_nc1://data/classifications/animals.adm"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql
deleted file mode 100644
index c47f048..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-add-fields/tiny-social-example/tiny-social-example.2.ddl.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-add-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-
-use dataverse TinySocial;
-
-create dataset FacebookUsers(FacebookUserType)
-primary key id;
-
-create dataset FacebookMessages(FacebookMessageType)
-primary key message-id;
-
-create dataset TwitterUsers(TwitterUserType)
-primary key screen-name;
-
-create dataset TweetMessages(TweetMessageType)
-primary key tweetid
-hints(cardinality=100);
-
-create index fbUserSinceIdx on FacebookUsers(user-since);
-create index fbAuthorIdx on FacebookMessages(author-id) type btree;
-create index fbSenderLocIndex on FacebookMessages(sender-location) type rtree;
-create index fbMessageIdx on FacebookMessages(message) type keyword;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.1.ddl.aql
deleted file mode 100644
index d4af896..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.1.ddl.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-merge under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type S as open{
-    id: int64
-}
-
-create type GS as open{
-    id: int64,
-    Genus: string
-}
-
-create type FGS as open{
-    id: int64,
-    Family: string
-}
-
-create type OFGS as open{
-    id: int64,
-    Order: string
-}
-
-create type COFGS as open{
-    id: int64,
-    Class: string
-}
-
-create type PCOFGS as open{
-    id: int64,
-    Phylum: string
-}
-
-create type KPCOFGS as open{
-    id: int64,
-    Kingdom: string
-}
-
-create type Classification as open{
-    id: int64
-}
-
-create type Animal as open{
-    id: int64
-}
-
-create dataset Animals(Animal)
-primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.2.update.aql
deleted file mode 100644
index 7db2401..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/highly-nested-open/highly-nested-open.2.update.aql
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-merge under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-use dataverse test;
-
-load dataset Animals using localfs
-(("path"="asterix_nc1://data/classifications/animals.adm"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.1.ddl.aql
deleted file mode 100644
index fbc09c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-merge/tiny-social-example/tiny-social-example.1.ddl.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-merge under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create type TweetMessageType as closed {
-        tweetid: string,
-        user: TwitterUserType,
-        sender-location: point?,
-        send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string
-}
-
-create type EmploymentType as open {
-        organization-name: string,
-        start-date: date,
-        end-date: date?
-}
-
-create type FacebookUserType as closed {
-        id: int64,
-        alias: string,
-        name: string,
-        user-since: datetime,
-        friend-ids: {{ int64 }},
-        employment: [EmploymentType]
-}
-
-create type FacebookMessageType as closed {
-        message-id: int64,
-        author-id: int64,
-        in-response-to: int64?,
-        sender-location: point?,
-        message: string
-}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql
deleted file mode 100644
index 6ade854..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/records/record-remove-fields/tiny-social-example/tiny-social-example.1.ddl.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing record-remove-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Aug 2015
-*/
-drop dataverse TinySocial if exists;
-create dataverse TinySocial;
-use dataverse TinySocial;
-
-create type TwitterUserType as open {
-        screen-name: string,
-        lang: string,
-        friends_count: int64,
-        statuses_count: int64,
-        name: string,
-        followers_count: int64
-}
-
-create type TweetMessageType as closed {
-        tweetid: string,
-        user: TwitterUserType,
-        sender-location: point?,
-        send-time: datetime,
-        referred-topics: {{ string }},
-        message-text: string
-}
-
-create type EmploymentType as open {
-        organization-name: string,
-        start-date: date,
-        end-date: date?
-}
-
-create type FacebookUserType as closed {
-        id: int64,
-        alias: string,
-        name: string,
-        user-since: datetime,
-        friend-ids: {{ int64 }},
-        employment: [EmploymentType]
-}
-
-create type FacebookMessageType as closed {
-        message-id: int64,
-        author-id: int64,
-        in-response-to: int64?,
-        sender-location: point?,
-        message: string
-}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
index e14a408..cb80b8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.2.update.sqlpp
index a92ba28..7663aae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.2.update.sqlpp
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.3.query.sqlpp
index 6561a1e..3c23ec3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.3.query.sqlpp
@@ -19,7 +19,7 @@
 /*
  * Test case Name  : opentype-insert2.aql
  * Description     : verify that the case where SetClosedRecordRule should not rewrite
- *                    the plan to use closed-record-descriptor
+ *                    the plan to use closed-object-descriptor
  * Expected Result : Success
  */
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/RecordsQueries.xml b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
similarity index 81%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/RecordsQueries.xml
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
index 10a8702..aedcab5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/RecordsQueries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/ObjectsQueries.xml
@@ -23,18 +23,18 @@
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_01">
-      <output-dir compare="Text">closed-record-constructor_01</output-dir>
+    <compilation-unit name="closed-object-constructor_01">
+      <output-dir compare="Text">closed-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_02">
-      <output-dir compare="Text">closed-record-constructor_02</output-dir>
+    <compilation-unit name="closed-object-constructor_02">
+      <output-dir compare="Text">closed-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="closed-record-constructor_03">
-      <output-dir compare="Text">closed-record-constructor_03</output-dir>
+    <compilation-unit name="closed-object-constructor_03">
+      <output-dir compare="Text">closed-object-constructor_03</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
@@ -52,52 +52,52 @@
       <output-dir compare="Text">field-access-on-open-field</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <!--test-case FilePath="records/get-record-fields">
+  <!--test-case FilePath="records/get-object-fields">
       <compilation-unit name="tiny-social-example">
           <output-dir compare="Text">tiny-social-example</output-dir>
       </compilation-unit>
   </test-case!-->
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-no-complex-types">
       <output-dir compare="Text">tiny-social-example-no-complex-types</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-only-lists">
       <output-dir compare="Text">tiny-social-example-only-lists</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-fields">
+  <test-case FilePath="records/get-object-fields">
     <compilation-unit name="tiny-social-example-only-records">
       <output-dir compare="Text">tiny-social-example-only-records</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="documentation-example">
       <output-dir compare="Text">documentation-example</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-closed">
       <output-dir compare="Text">highly-nested-closed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-mixed">
       <output-dir compare="Text">highly-nested-mixed</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="highly-nested-open">
       <output-dir compare="Text">highly-nested-open</output-dir>
     </compilation-unit>
   </test-case>
-  <test-case FilePath="records/get-record-field-value">
+  <test-case FilePath="records/get-object-field-value">
     <compilation-unit name="tiny-social-example">
       <output-dir compare="Text">tiny-social-example</output-dir>
     </compilation-unit>
@@ -113,13 +113,13 @@
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="open-record-constructor_01">
-      <output-dir compare="Text">open-record-constructor_01</output-dir>
+    <compilation-unit name="open-object-constructor_01">
+      <output-dir compare="Text">open-object-constructor_01</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
-    <compilation-unit name="open-record-constructor_02">
-      <output-dir compare="Text">open-record-constructor_02</output-dir>
+    <compilation-unit name="open-object-constructor_02">
+      <output-dir compare="Text">open-object-constructor_02</output-dir>
     </compilation-unit>
   </test-case>
   <test-case FilePath="records">
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.10.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.10.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.10.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.10.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.11.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.11.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.11.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.11.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.12.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.12.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.12.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.12.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.4.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.4.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.4.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.5.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.5.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.5.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.6.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.6.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.6.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.7.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.7.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.7.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.8.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.8.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.8.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.8.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.9.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/access-nested-fields/access-nested-fields.9.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.9.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.sqlpp
similarity index 93%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.sqlpp
index 5ef476a..804ce6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.query.sqlpp
@@ -22,4 +22,4 @@
 
 set `import-private-functions` `true`;
 
-select element test.`closed-record-constructor`('foo1',10,'bar1',20,'foo2',30,'bar2',40);
+select element test.`closed-object-constructor`('foo1',10,'bar1',20,'foo2',30,'bar2',40);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.sqlpp
similarity index 82%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.sqlpp
index b3797a6..1d63fd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.query.sqlpp
@@ -22,4 +22,4 @@
 
 set `import-private-functions` `true`;
 
-select element test.`closed-record-constructor`('foo1',10,'bar1',test.`closed-record-constructor`('bar1.1',10,'bar1.2',20,'bar1.3',30,'bar1.4',test.`closed-record-constructor`('bar1.4.1',10,'bar1.4.2',20,'bar1.4.3',30,'bar1.4.4',40),'foo2',30,'bar2',40),'foo2',30,'bar2',40);
+select element test.`closed-object-constructor`('foo1',10,'bar1',test.`closed-object-constructor`('bar1.1',10,'bar1.2',20,'bar1.3',30,'bar1.4',test.`closed-object-constructor`('bar1.4.1',10,'bar1.4.2',20,'bar1.4.3',30,'bar1.4.4',40),'foo2',30,'bar2',40),'foo2',30,'bar2',40);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/expFieldName/expFieldName.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/expFieldName/expFieldName.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-by-index_01/field-access-by-index_01.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/field-access-on-open-field/field-access-on-open-field.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.query.sqlpp
index e6665f1..4c1e63d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.query.sqlpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 
-`get-record-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'project');
+`get-object-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'project');
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.query.sqlpp
index aa24960..20d6cef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.query.sqlpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 
-`get-record-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'address');
+`get-object-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'address');
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.query.sqlpp
index 8a96438..34afcbd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.query.sqlpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 
-`get-record-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'related');
+`get-object-field-value`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']},'related');
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
index 777327b..a190e2a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
similarity index 93%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
index ede79d4..8263dbc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
index 8cdd648..95c2f2c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,6 +27,6 @@
 
 select element result
 from  Animals as test
-with  result as test.`get-record-field-value`(test,'class')
+with  result as test.`get-object-field-value`(test,'class')
 order by result.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
index 2eae934..0ed17a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp
index ede79d4..8263dbc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp
index 8cdd648..95c2f2c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,6 +27,6 @@
 
 select element result
 from  Animals as test
-with  result as test.`get-record-field-value`(test,'class')
+with  result as test.`get-object-field-value`(test,'class')
 order by result.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
index 52bdeba..b4e3046 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp
similarity index 93%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp
index ede79d4..8263dbc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp
index 8cdd648..95c2f2c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,6 +27,6 @@
 
 select element result
 from  Animals as test
-with  result as test.`get-record-field-value`(test,'class')
+with  result as test.`get-object-field-value`(test,'class')
 order by result.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
index 4b6d909..ab17433 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
index 0bcc912..e78240e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp
index 7ce0754..ec7b327 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
similarity index 85%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
index 66b2d78..53fb211 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-field-value under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,8 +27,8 @@
 
 select element result
 from  TweetMessages as r,
-      TinySocial.`get-record-fields`(r) as f
-with  result as TinySocial.`get-record-field-value`(r,f.`field-name`)
+      TinySocial.`get-object-fields`(r) as f
+with  result as TinySocial.`get-object-field-value`(r,f.`field-name`)
 where (f.`field-type` = 'STRING')
 order by result
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.query.sqlpp
similarity index 87%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.query.sqlpp
index 37c6f43..ba55d8c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.query.sqlpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
 
-`get-record-fields`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']});
+`get-object-fields`({'id':1,'project':'AsterixDB','address':{'city':'Irvine','state':'CA'},'related':['Hivestrix','Preglix','Apache VXQuery']});
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
index 3c17ed6..e6d7a9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp
index e4a143e..ef32bf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp
index bedf6f6..7d20237 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
index 850a9e9..ff388d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(user)
+select element TinySocial.`get-object-fields`(user)
 from  FacebookUsersAlternate as user
 where (user.id = 8)
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp
index 46f338f..c9dda20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookUsersAlternate as r
 order by r.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp
index 0c2d20a..3e99bce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookMessagesAlternate as r
 order by r.`message-id`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp
index b39e357..50e8f0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TwitterUsersAlternate as r
 order by r.`screen-name`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp
index 8432356..b62332c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TweetMessagesAlternate as r
 order by r.tweetid
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
index c650f49..36265da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,7 +27,7 @@
 
 select element {'field-name':n,'field-type':t,'count':count}
 from  TweetMessagesAlternate as r,
-      TinySocial.`get-record-fields`(r) as f
+      TinySocial.`get-object-fields`(r) as f
 group by f.`field-name` as n,f.`field-type` as t
 with  count as TinySocial.count(r)
 order by n,t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
index 7e4d6d2..4abc9e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
index e4a143e..ef32bf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp
index 0f9620f..fd3bd38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp
index 850a9e9..ff388d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(user)
+select element TinySocial.`get-object-fields`(user)
 from  FacebookUsersAlternate as user
 where (user.id = 8)
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp
index 46f338f..c9dda20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookUsersAlternate as r
 order by r.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp
index 0c2d20a..3e99bce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookMessagesAlternate as r
 order by r.`message-id`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp
index b39e357..50e8f0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TwitterUsersAlternate as r
 order by r.`screen-name`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp
index 8432356..b62332c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TweetMessagesAlternate as r
 order by r.tweetid
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp
index c650f49..36265da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,7 +27,7 @@
 
 select element {'field-name':n,'field-type':t,'count':count}
 from  TweetMessagesAlternate as r,
-      TinySocial.`get-record-fields`(r) as f
+      TinySocial.`get-object-fields`(r) as f
 group by f.`field-name` as n,f.`field-type` as t
 with  count as TinySocial.count(r)
 order by n,t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
similarity index 97%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
index e50deda..825ff4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp
similarity index 96%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp
index e4a143e..ef32bf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp
index b49d23c..7d73a99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp
index 850a9e9..ff388d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(user)
+select element TinySocial.`get-object-fields`(user)
 from  FacebookUsersAlternate as user
 where (user.id = 8)
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp
index 46f338f..c9dda20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookUsersAlternate as r
 order by r.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp
index 0c2d20a..3e99bce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookMessagesAlternate as r
 order by r.`message-id`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp
index b39e357..50e8f0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TwitterUsersAlternate as r
 order by r.`screen-name`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp
index 8432356..b62332c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TweetMessagesAlternate as r
 order by r.tweetid
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp
similarity index 90%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp
index c650f49..36265da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,7 +27,7 @@
 
 select element {'field-name':n,'field-type':t,'count':count}
 from  TweetMessagesAlternate as r,
-      TinySocial.`get-record-fields`(r) as f
+      TinySocial.`get-object-fields`(r) as f
 group by f.`field-name` as n,f.`field-type` as t
 with  count as TinySocial.count(r)
 order by n,t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
similarity index 96%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
index 9bb8679..9c61cd1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp
index 0bcc912..42d3a1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-field-value under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.sqlpp
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.sqlpp
index aa991a7..62775bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.3.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.sqlpp
index bb71f3f..d4acbf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.4.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.4.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(user)
+select element TinySocial.`get-object-fields`(user)
 from  FacebookUsers as user
 where (user.id = 8)
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.sqlpp
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.sqlpp
index e839632..7bac952 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.5.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.5.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookUsers as r
 order by r.id
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.sqlpp
index 4ec7f0a..080e2c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.6.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.6.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  FacebookMessages as r
 order by r.`message-id`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.sqlpp
index 82710ef..1ae85a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.7.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.7.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TwitterUsers as r
 order by r.`screen-name`
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.sqlpp
similarity index 89%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.sqlpp
index ef1d9bc..47e1660 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.8.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.8.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -25,7 +25,7 @@
 use TinySocial;
 
 
-select element TinySocial.`get-record-fields`(r)
+select element TinySocial.`get-object-fields`(r)
 from  TweetMessages as r
 order by r.tweetid
 ;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.sqlpp
similarity index 90%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.sqlpp
index e0bb578..13ccad3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.9.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.9.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Testing get-record-fields under different queries.
+* Description  : Testing get-object-fields under different queries.
 * Expected Res : Success
 * Date         : 04 Jun 2015
 */
@@ -27,7 +27,7 @@
 
 select element {'field-name':n,'field-type':t,'count':count}
 from  TweetMessages as r,
-      TinySocial.`get-record-fields`(r) as f
+      TinySocial.`get-object-fields`(r) as f
 group by f.`field-name` as n,f.`field-type` as t
 with  count as TinySocial.count(r)
 order by n,t
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs-2/object_pairs.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs/object_pairs.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs/object_pairs.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/object_pairs/object_pairs.1.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs/object_pairs.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.query.sqlpp
similarity index 93%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.query.sqlpp
index ed6de42..194a9ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.query.sqlpp
@@ -22,4 +22,4 @@
 
 set `import-private-functions` `true`;
 
-select element test.`open-record-constructor`('foo1',10,'bar1',20,'foo2',30,'bar2',40);
+select element test.`open-object-constructor`('foo1',10,'bar1',20,'foo2',30,'bar2',40);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.query.sqlpp
similarity index 82%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.query.sqlpp
index f4700cc..c997019 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.query.sqlpp
@@ -22,4 +22,4 @@
 
 set `import-private-functions` `true`;
 
-select element test.`open-record-constructor`('foo1',10,'bar1',test.`closed-record-constructor`('bar1.1',10,'bar1.2',20,'bar1.3',30,'bar1.4',test.`closed-record-constructor`('bar1.4.1',10,'bar1.4.2',20,'bar1.4.3',30,'bar1.4.4',40),'foo2',30,'bar2',40),'foo2',30,'bar2',40);
+select element test.`open-object-constructor`('foo1',10,'bar1',test.`closed-object-constructor`('bar1.1',10,'bar1.2',20,'bar1.3',30,'bar1.4',test.`closed-object-constructor`('bar1.4.1',10,'bar1.4.2',20,'bar1.4.3',30,'bar1.4.4',40),'foo2',30,'bar2',40),'foo2',30,'bar2',40);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp
deleted file mode 100644
index ede79d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.update.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use test;
-
-
-load  dataset Animals using localfs ((`path`=`asterix_nc1://data/classifications/animals.adm`),(`format`=`adm`));
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp
deleted file mode 100644
index ede79d4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.2.update.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use test;
-
-
-load  dataset Animals using localfs ((`path`=`asterix_nc1://data/classifications/animals.adm`),(`format`=`adm`));
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp
deleted file mode 100644
index 8cdd648..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.query.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-field-value under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use test;
-
-
-select element result
-from  Animals as test
-with  result as test.`get-record-field-value`(test,'class')
-order by result.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp
deleted file mode 100644
index 850a9e9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.query.sqlpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-select element TinySocial.`get-record-fields`(user)
-from  FacebookUsersAlternate as user
-where (user.id = 8)
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp
deleted file mode 100644
index c650f49..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.query.sqlpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-select element {'field-name':n,'field-type':t,'count':count}
-from  TweetMessagesAlternate as r,
-      TinySocial.`get-record-fields`(r) as f
-group by f.`field-name` as n,f.`field-type` as t
-with  count as TinySocial.count(r)
-order by n,t
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp
deleted file mode 100644
index e4a143e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ddl.sqlpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-create  dataset FacebookUsers(FacebookUserType) primary key id;
-
-create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
-
-create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
-
-create  dataset TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
-
-create  index fbUserSinceIdx  on FacebookUsers (`user-since`) type btree;
-
-create  index fbAuthorIdx  on FacebookMessages (`author-id`) type btree;
-
-create  index fbSenderLocIndex  on FacebookMessages (`sender-location`) type rtree;
-
-create  index fbMessageIdx  on FacebookMessages (message) type keyword;
-
-create  dataset FacebookUsersAlternate(FacebookUserAlternateType) primary key id;
-
-create  dataset FacebookMessagesAlternate(FacebookMessageAlternateType) primary key `message-id`;
-
-create  dataset TwitterUsersAlternate(TwitterUserAlternateType) primary key `screen-name`;
-
-create  dataset TweetMessagesAlternate(TweetMessageAlternateType) primary key tweetid;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp
deleted file mode 100644
index 850a9e9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.query.sqlpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-select element TinySocial.`get-record-fields`(user)
-from  FacebookUsersAlternate as user
-where (user.id = 8)
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp
deleted file mode 100644
index c650f49..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.query.sqlpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-select element {'field-name':n,'field-type':t,'count':count}
-from  TweetMessagesAlternate as r,
-      TinySocial.`get-record-fields`(r) as f
-group by f.`field-name` as n,f.`field-type` as t
-with  count as TinySocial.count(r)
-order by n,t
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp
deleted file mode 100644
index 9e0d99f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/records/get-record-fields/tiny-social-example/tiny-social-example.2.ddl.sqlpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-* Description  : Testing get-record-fields under different queries.
-* Expected Res : Success
-* Date         : 04 Jun 2015
-*/
-
-use TinySocial;
-
-
-create  dataset FacebookUsers(FacebookUserType) primary key id;
-
-create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
-
-create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
-
-create  dataset TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
-
-create  index fbUserSinceIdx  on FacebookUsers (`user-since`) type btree;
-
-create  index fbAuthorIdx  on FacebookMessages (`author-id`) type btree;
-
-create  index fbSenderLocIndex  on FacebookMessages (`sender-location`) type rtree;
-
-create  index fbMessageIdx  on FacebookMessages (message) type keyword;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/repeatedtestsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/repeatedtestsuite.xml
index 53b23ca..94d0316 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/repeatedtestsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/repeatedtestsuite.xml
@@ -25,7 +25,7 @@
   <!-- The following test case is commented out as an example. -->
   <test-group name="repeated-tests">
     <!--
-            <test-case FilePath="records/get-record-fields">
+            <test-case FilePath="records/get-object-fields">
                 <compilation-unit name="tiny-social-example">
                     <output-dir compare="Text">tiny-social-example</output-dir>
                 </compilation-unit>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.10.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.10.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.10.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.10.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.11.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.11.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.11.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.11.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.12.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.12.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.12.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.5.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.6.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.6.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.6.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.7.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.7.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.7.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.8.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.8.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.8.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.9.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/access-nested-fields/access-nested-fields.9.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/access-nested-fields/access-nested-fields.9.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-nullable-fields_issue1616/closed-nullable-fields_issue1616.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01/closed-record-constructor_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_01/closed-record-constructor_01.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_01/closed-record-constructor_01.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_01/closed-record-constructor_01.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02/closed-record-constructor_02.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_02/closed-record-constructor_02.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_02/closed-record-constructor_02.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_02/closed-record-constructor_02.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03/closed-record-constructor_03.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_03/closed-record-constructor_03.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/closed-record-constructor_03/closed-record-constructor_03.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/closed-object-constructor_03/closed-record-constructor_03.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/expFieldName/expFieldName.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/expFieldName/expFieldName.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/expFieldName/expFieldName.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/expFieldName/expFieldName.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01/field-access-by-index_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/field-access-by-index_01/field-access-by-index_01.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/field-access-by-index_01/field-access-by-index_01.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/field-access-by-index_01/field-access-by-index_01.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-field/field-access-on-open-field.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/field-access-on-open-field/field-access-on-open-field.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/field-access-on-open-field/field-access-on-open-field.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/field-access-on-open-field/field-access-on-open-field.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.2.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.2.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.2.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/documentation-example/documentation-example.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/documentation-example/documentation-example.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-closed/highly-nested-closed.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-closed/highly-nested-closed.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-closed/highly-nested-closed.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-closed/highly-nested-closed.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-open/highly-nested-open.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/highly-nested-open/highly-nested-open.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/tiny-social-example/tiny-social-example.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-field-value/tiny-social-example/tiny-social-example.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/documentation-example/documentation-example.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/documentation-example/documentation-example.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.5.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.5.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.5.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.6.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.6.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.6.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.7.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.7.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.7.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.8.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.8.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.8.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.9.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/get-record-fields/tiny-social-example/tiny-social-example.9.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/get-object-fields/tiny-social-example/tiny-social-example.9.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.2.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.2.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.2.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/documentation-example/documentation-example.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/documentation-example/documentation-example.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/highly-nested-open/highly-nested-open.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/highly-nested-open/highly-nested-open.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/highly-nested-open/highly-nested-open.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/highly-nested-open/highly-nested-open.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/tiny-social-example/tiny-social-example.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/tiny-social-example/tiny-social-example.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-add-fields/tiny-social-example/tiny-social-example.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-add-fields/tiny-social-example/tiny-social-example.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.2.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.2.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.2.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/documentation-example/documentation-example.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/documentation-example/documentation-example.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/highly-nested-open/highly-nested-open.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/highly-nested-open/highly-nested-open.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/highly-nested-open/highly-nested-open.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/highly-nested-open/highly-nested-open.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/tiny-social-example/tiny-social-example.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/tiny-social-example/tiny-social-example.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-merge/tiny-social-example/tiny-social-example.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-merge/tiny-social-example/tiny-social-example.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.2.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.2.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.2.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/documentation-example/documentation-example.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/documentation-example/documentation-example.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/highly-nested-open/highly-nested-open.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/highly-nested-open/highly-nested-open.3.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/highly-nested-open/highly-nested-open.3.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/highly-nested-open/highly-nested-open.3.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/tiny-social-example/tiny-social-example.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/tiny-social-example/tiny-social-example.4.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/record-remove-fields/tiny-social-example/tiny-social-example.4.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object-remove-fields/tiny-social-example/tiny-social-example.4.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/object_pairs-2/object_pairs-2.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_pairs-2/object_pairs-2.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/object_pairs-2/object_pairs-2.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_pairs-2/object_pairs-2.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/object_pairs/object_pairs.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_pairs/object_pairs.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/object_pairs/object_pairs.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_pairs/object_pairs.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01/open-record-constructor_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/open-object-constructor_01/open-record-constructor_01.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_01/open-record-constructor_01.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/open-object-constructor_01/open-record-constructor_01.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02/open-record-constructor_02.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/open-object-constructor_02/open-record-constructor_02.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/records/open-record-constructor_02/open-record-constructor_02.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/open-object-constructor_02/open-record-constructor_02.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.10.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.11.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.11.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.12.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.12.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.4.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.5.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.6.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.7.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.8.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/access-nested-fields/access-nested-fields.9.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-closed-fieldname-conflict_issue173/closed-closed-fieldname-conflict_issue173.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
similarity index 86%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
index e9e175b..a24813d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_01/closed-record-constructor_01.3.ast
@@ -2,7 +2,7 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.closed-record-constructor@8[
+FunctionCall test.closed-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
similarity index 85%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
index db26503..0fd5e43 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_02/closed-record-constructor_02.3.ast
@@ -2,11 +2,11 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.open-record-constructor@8[
+FunctionCall test.closed-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-record-constructor@12[
+  FunctionCall test.closed-object-constructor@12[
     LiteralExpr [STRING] [bar1.1]
     LiteralExpr [LONG] [10]
     LiteralExpr [STRING] [bar1.2]
@@ -14,7 +14,7 @@
     LiteralExpr [STRING] [bar1.3]
     LiteralExpr [LONG] [30]
     LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-record-constructor@8[
+    FunctionCall test.closed-object-constructor@8[
       LiteralExpr [STRING] [bar1.4.1]
       LiteralExpr [LONG] [10]
       LiteralExpr [STRING] [bar1.4.2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_03/closed-record-constructor_03.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/closed-object-constructor_03/closed-record-constructor_03.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/expFieldName/expFieldName.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/expFieldName/expFieldName.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-by-index_01/field-access-by-index_01.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-by-index_01/field-access-by-index_01.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/field-access-on-open-field/field-access-on-open-field.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
similarity index 94%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
index ccbee67..288ed48 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.1.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-record-field-value@2[
+FunctionCall null.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
similarity index 94%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
index d9f4315..b95a864 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.2.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-record-field-value@2[
+FunctionCall null.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
similarity index 94%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
index 701736f..8f5b139 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/documentation-example/documentation-example.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/documentation-example/documentation-example.3.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-record-field-value@2[
+FunctionCall null.get-object-field-value@2[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
similarity index 88%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
index 7e2b064..844db7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-record-field-value@2[
+  FunctionCall test.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
index 7e2b064..844db7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-record-field-value@2[
+  FunctionCall test.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
similarity index 88%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
index 7e2b064..844db7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-closed/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
@@ -10,7 +10,7 @@
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall test.get-record-field-value@2[
+  FunctionCall test.get-object-field-value@2[
     Variable [ Name=$test ]
     LiteralExpr [STRING] [class]
   ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
similarity index 85%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
index 5ba98ed..62d2ab4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/tiny-social-example/tiny-social-example.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
@@ -8,14 +8,14 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-record-fields@1[
+  FunctionCall TinySocial.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
 ]
 Let Variable [ Name=$result ]
   :=
-  FunctionCall TinySocial.get-record-field-value@2[
+  FunctionCall TinySocial.get-object-field-value@2[
     Variable [ Name=$r ]
     FieldAccessor [
       Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
similarity index 94%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
index f9cdeed..f5041fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/documentation-example/documentation-example.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/documentation-example/documentation-example.1.ast
@@ -1,5 +1,5 @@
 Query:
-FunctionCall null.get-record-fields@1[
+FunctionCall null.get-object-fields@1[
   RecordConstructor [
     (
       LiteralExpr [STRING] [id]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
similarity index 87%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
index 7a8360b..b1b51e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
similarity index 85%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
index 6e1bdec..b623766 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
index 525a799..21c3121 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
index 593fbfa..d3d80bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
similarity index 85%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
index d375a57..112eff2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
similarity index 95%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
index 19427c1..b7493c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-record-fields@1[
+  FunctionCall TinySocial.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
similarity index 87%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
index 7a8360b..b1b51e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
index 6e1bdec..b623766 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
index 525a799..21c3121 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
index 593fbfa..d3d80bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
index d375a57..112eff2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
index 19427c1..b7493c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-record-fields@1[
+  FunctionCall TinySocial.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
similarity index 87%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
index 7a8360b..b1b51e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$user ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
index 6e1bdec..b623766 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
index 525a799..21c3121 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
index 593fbfa..d3d80bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
index d375a57..112eff2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
@@ -1,7 +1,7 @@
 DataverseUse TinySocial
 Query:
 SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
+FunctionCall TinySocial.get-object-fields@1[
   Variable [ Name=$r ]
 ]
 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
similarity index 95%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
index 19427c1..b7493c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
@@ -24,7 +24,7 @@
   ]
   AS Variable [ Name=$r ]
 ,
-  FunctionCall TinySocial.get-record-fields@1[
+  FunctionCall TinySocial.get-object-fields@1[
     Variable [ Name=$r ]
   ]
   AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
similarity index 86%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
index e9e175b..508889a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_01/closed-record-constructor_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_01/open-record-constructor_01.3.ast
@@ -2,7 +2,7 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.closed-record-constructor@8[
+FunctionCall test.open-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
similarity index 85%
copy from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
copy to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
index db26503..98594db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_02/open-record-constructor_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-object-constructor_02/open-record-constructor_02.3.ast
@@ -2,11 +2,11 @@
 Set import-private-functions=true
 Query:
 SELECT ELEMENT [
-FunctionCall test.open-record-constructor@8[
+FunctionCall test.open-object-constructor@8[
   LiteralExpr [STRING] [foo1]
   LiteralExpr [LONG] [10]
   LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-record-constructor@12[
+  FunctionCall test.closed-object-constructor@12[
     LiteralExpr [STRING] [bar1.1]
     LiteralExpr [LONG] [10]
     LiteralExpr [STRING] [bar1.2]
@@ -14,7 +14,7 @@
     LiteralExpr [STRING] [bar1.3]
     LiteralExpr [LONG] [30]
     LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-record-constructor@8[
+    FunctionCall test.closed-object-constructor@8[
       LiteralExpr [STRING] [bar1.4.1]
       LiteralExpr [LONG] [10]
       LiteralExpr [STRING] [bar1.4.2]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.2.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
rename to asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.ast
deleted file mode 100644
index a230856..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/closed-record-constructor_02/closed-record-constructor_02.3.ast
+++ /dev/null
@@ -1,37 +0,0 @@
-DataverseUse test
-Set import-private-functions=true
-Query:
-SELECT ELEMENT [
-FunctionCall test.closed-record-constructor@8[
-  LiteralExpr [STRING] [foo1]
-  LiteralExpr [LONG] [10]
-  LiteralExpr [STRING] [bar1]
-  FunctionCall test.closed-record-constructor@12[
-    LiteralExpr [STRING] [bar1.1]
-    LiteralExpr [LONG] [10]
-    LiteralExpr [STRING] [bar1.2]
-    LiteralExpr [LONG] [20]
-    LiteralExpr [STRING] [bar1.3]
-    LiteralExpr [LONG] [30]
-    LiteralExpr [STRING] [bar1.4]
-    FunctionCall test.closed-record-constructor@8[
-      LiteralExpr [STRING] [bar1.4.1]
-      LiteralExpr [LONG] [10]
-      LiteralExpr [STRING] [bar1.4.2]
-      LiteralExpr [LONG] [20]
-      LiteralExpr [STRING] [bar1.4.3]
-      LiteralExpr [LONG] [30]
-      LiteralExpr [STRING] [bar1.4.4]
-      LiteralExpr [LONG] [40]
-    ]
-    LiteralExpr [STRING] [foo2]
-    LiteralExpr [LONG] [30]
-    LiteralExpr [STRING] [bar2]
-    LiteralExpr [LONG] [40]
-  ]
-  LiteralExpr [STRING] [foo2]
-  LiteralExpr [LONG] [30]
-  LiteralExpr [STRING] [bar2]
-  LiteralExpr [LONG] [40]
-]
-]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
deleted file mode 100644
index 7e2b064..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
+++ /dev/null
@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$result ]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [Animals]
-  ]
-  AS Variable [ Name=$test ]
-]
-Let Variable [ Name=$result ]
-  :=
-  FunctionCall test.get-record-field-value@2[
-    Variable [ Name=$test ]
-    LiteralExpr [STRING] [class]
-  ]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$result ]
-    Field=id
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.ast
deleted file mode 100644
index 7e2b064..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-field-value/highly-nested-open/highly-nested-open.3.ast
+++ /dev/null
@@ -1,23 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$result ]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [Animals]
-  ]
-  AS Variable [ Name=$test ]
-]
-Let Variable [ Name=$result ]
-  :=
-  FunctionCall test.get-record-field-value@2[
-    Variable [ Name=$test ]
-    LiteralExpr [STRING] [class]
-  ]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$result ]
-    Field=id
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
deleted file mode 100644
index 7a8360b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
+++ /dev/null
@@ -1,21 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$user ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$user ]
-]
-Where
-  OperatorExpr [
-    FieldAccessor [
-      Variable [ Name=$user ]
-      Field=id
-    ]
-    =
-    LiteralExpr [LONG] [8]
-  ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
deleted file mode 100644
index 6e1bdec..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=id
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
deleted file mode 100644
index d375a57..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=tweetid
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
deleted file mode 100644
index 19427c1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
+++ /dev/null
@@ -1,71 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [field-name]
-    :
-    Variable [ Name=$n ]
-  )
-  (
-    LiteralExpr [STRING] [field-type]
-    :
-    Variable [ Name=$t ]
-  )
-  (
-    LiteralExpr [STRING] [count]
-    :
-    Variable [ Name=$count ]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-,
-  FunctionCall TinySocial.get-record-fields@1[
-    Variable [ Name=$r ]
-  ]
-  AS Variable [ Name=$f ]
-]
-Groupby
-  Variable [ Name=$n ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-name
-  ]
-  Variable [ Name=$t ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-type
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    r:=Variable [ Name=$r ]
-    f:=Variable [ Name=$f ]
-  )
-
-Let Variable [ Name=$count ]
-  :=
-  FunctionCall TinySocial.sql-count@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=r
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#2 ]
-      ]
-    )
-  ]
-Orderby
-  Variable [ Name=$n ]
-  ASC
-  Variable [ Name=$t ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
deleted file mode 100644
index 7a8360b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
+++ /dev/null
@@ -1,21 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$user ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$user ]
-]
-Where
-  OperatorExpr [
-    FieldAccessor [
-      Variable [ Name=$user ]
-      Field=id
-    ]
-    =
-    LiteralExpr [LONG] [8]
-  ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
deleted file mode 100644
index 6e1bdec..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [FacebookUsersAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=id
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
deleted file mode 100644
index d375a57..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
+++ /dev/null
@@ -1,19 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-FunctionCall TinySocial.get-record-fields@1[
-  Variable [ Name=$r ]
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-]
-Orderby
-  FieldAccessor [
-    Variable [ Name=$r ]
-    Field=tweetid
-  ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
deleted file mode 100644
index 19427c1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/get-record-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
+++ /dev/null
@@ -1,71 +0,0 @@
-DataverseUse TinySocial
-Query:
-SELECT ELEMENT [
-RecordConstructor [
-  (
-    LiteralExpr [STRING] [field-name]
-    :
-    Variable [ Name=$n ]
-  )
-  (
-    LiteralExpr [STRING] [field-type]
-    :
-    Variable [ Name=$t ]
-  )
-  (
-    LiteralExpr [STRING] [count]
-    :
-    Variable [ Name=$count ]
-  )
-]
-]
-FROM [  FunctionCall Metadata.dataset@1[
-    LiteralExpr [STRING] [TweetMessagesAlternate]
-  ]
-  AS Variable [ Name=$r ]
-,
-  FunctionCall TinySocial.get-record-fields@1[
-    Variable [ Name=$r ]
-  ]
-  AS Variable [ Name=$f ]
-]
-Groupby
-  Variable [ Name=$n ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-name
-  ]
-  Variable [ Name=$t ]
-  :=
-  FieldAccessor [
-    Variable [ Name=$f ]
-    Field=field-type
-  ]
-  GROUP AS Variable [ Name=#1 ]
-  (
-    r:=Variable [ Name=$r ]
-    f:=Variable [ Name=$f ]
-  )
-
-Let Variable [ Name=$count ]
-  :=
-  FunctionCall TinySocial.sql-count@1[
-    (
-      SELECT ELEMENT [
-      FieldAccessor [
-        Variable [ Name=#2 ]
-        Field=r
-      ]
-      ]
-      FROM [        Variable [ Name=#1 ]
-        AS Variable [ Name=#2 ]
-      ]
-    )
-  ]
-Orderby
-  Variable [ Name=$n ]
-  ASC
-  Variable [ Name=$t ]
-  ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
deleted file mode 100644
index ec19477..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/records/open-record-constructor_01/open-record-constructor_01.3.ast
+++ /dev/null
@@ -1,15 +0,0 @@
-DataverseUse test
-Set import-private-functions=true
-Query:
-SELECT ELEMENT [
-FunctionCall test.open-record-constructor@8[
-  LiteralExpr [STRING] [foo1]
-  LiteralExpr [LONG] [10]
-  LiteralExpr [STRING] [bar1]
-  LiteralExpr [LONG] [20]
-  LiteralExpr [STRING] [foo2]
-  LiteralExpr [LONG] [30]
-  LiteralExpr [STRING] [bar2]
-  LiteralExpr [LONG] [40]
-]
-]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index 7a19102..c5afa97 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -22,7 +22,7 @@
              <!ENTITY APIQueries SYSTEM "queries/api/APIQueries.xml">
              <!ENTITY ComparisonQueries SYSTEM "queries/comparison/ComparisonQueries.xml">
              <!ENTITY DeepEqualQueries SYSTEM "queries/comparison/deep_equal/DeepEqualQueries.xml">
-             <!ENTITY RecordsQueries SYSTEM "queries/records/RecordsQueries.xml">
+             <!ENTITY RecordsQueries SYSTEM "queries/objects/ObjectsQueries.xml">
              <!ENTITY TemporalQueries SYSTEM "queries/temporal/TemporalQueries.xml">
 
              ]>
@@ -3361,8 +3361,8 @@
         </compilation-unit>
       </test-case>
       <test-case FilePath="open-index-enforced/error-checking">
-        <compilation-unit name="record-type-collision">
-          <output-dir compare="Text">record-type-collision</output-dir>
+        <compilation-unit name="object-type-collision">
+          <output-dir compare="Text">object-type-collision</output-dir>
           <expected-error>org.apache.asterix.common.exceptions.AsterixException: A field "[value]" is already defined with the type "STRING"</expected-error>
         </compilation-unit>
       </test-case>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index ada8989..f89fd63 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -17,7 +17,7 @@
  ! under the License.
  !-->
 <!DOCTYPE test-suite [
-  <!ENTITY RecordsQueries SYSTEM "queries_sqlpp/records/RecordsQueries.xml">
+  <!ENTITY RecordsQueries SYSTEM "queries_sqlpp/objects/ObjectsQueries.xml">
 
 ]>
 <test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp">
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
index 5fee98c..df7e5a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
@@ -18,7 +18,7 @@
  !-->
 <!DOCTYPE test-suite [
 
-             <!ENTITY RecordsQueries SYSTEM "queries/records/RecordsQueries.xml">
+             <!ENTITY RecordsQueries SYSTEM "queries/objects/ObjectsQueries.xml">
 
              ]>
 <test-suite
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md b/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
index 2cab02c3..911ee63 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/0_toc.md
@@ -28,7 +28,7 @@
 * [Similarity Functions](#SimilarityFunctions)
 * [Tokenizing Functions](#TokenizingFunctions)
 * [Temporal Functions](#TemporalFunctions)
-* [Record Functions](#RecordFunctions)
+* [Object Functions](#ObjectFunctions)
 * [Aggregate Functions (Array Functions)](#AggregateFunctions)
 * [Comparison Functions](#ComparisonFunctions)
 * [Type Functions](#TypeFunctions)
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
index 7d355b2..7e8a7fe 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/11_type.md
@@ -129,11 +129,11 @@
 
         is_object(expr)
 
- * Checks whether the given expression is evaluated to be a `record` value.
+ * Checks whether the given expression is evaluated to be a `object` value.
  * Arguments:
     * `expr` : an expression (any type is allowed).
  * Return Value:
-    * a `boolean` on whether the argument is a `record` value or not,
+    * a `boolean` on whether the argument is a `object` value or not,
     * a `missing` if the argument is a `missing` value,
     * a `null` if the argument is a `null` value.
 
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
index ee5ca31..b28443c 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/12_misc.md
@@ -151,7 +151,7 @@
         deep_equal(expr1, expr2)
 
 
- * Assess the equality between two expressions of any type (e.g., record, arrays, or multiset).
+ * Assess the equality between two expressions of any type (e.g., object, arrays, or multiset).
  Two objects are deeply equal iff both their types and values are equal.
  * Arguments:
     * `expr1` : an expression,
diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md b/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
index a110433..d7ec35b 100644
--- a/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
+++ b/asterixdb/asterix-doc/src/main/markdown/builtins/8_record.md
@@ -17,27 +17,27 @@
  ! under the License.
  !-->
 
-## <a id="RecordFunctions">Record Functions</a> ##
+## <a id="ObjectFunctions">Object Functions</a> ##
 
-### get_record_fields ###
+### get_object_fields ###
  * Syntax:
 
-        get_record_fields(input_record)
+        get_object_fields(input_object)
 
- * Access the record field names, type and open status for a given record.
+ * Access the object field names, type and open status for a given object.
  * Arguments:
-    * `input_record` : a record value.
+    * `input_object` : a object value.
  * Return Value:
-    * an array of `record` values that include the field_name `string`,
+    * an array of `object` values that include the field_name `string`,
       field_type `string`, is_open `boolean` (used for debug purposes only: `true` if field is open and `false` otherwise),
-      and optional nested `orderedList` for the values of a nested record,
+      and optional nested `orderedList` for the values of a nested object,
     * `missing` if the argument is a `missing` value,
     * `null` if the argument is a `null` value,
-    * any other non-record input value will cause a type error.
+    * any other non-object input value will cause a type error.
 
  * Example:
 
-        get_record_fields(
+        get_object_fields(
                           {
                             "id": 1,
                             "project": "AsterixDB",
@@ -70,26 +70,26 @@
         ]
 
  ]
-### get_record_field_value ###
+### get_object_field_value ###
  * Syntax:
 
-        get_record_field_value(input_record, string)
+        get_object_field_value(input_object, string)
 
- * Access the field name given in the `string_expression` from the `record_expression`.
+ * Access the field name given in the `string_expression` from the `object_expression`.
  * Arguments:
-    * `input_record` : a `record` value.
+    * `input_object` : a `object` value.
     * `string` : a `string` representing the top level field name.
  * Return Value:
-    * an `any` value saved in the designated field of the record,
+    * an `any` value saved in the designated field of the object,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
+        * the first argument is any other non-object value,
         * or, the second argument is any other non-string value.
 
  * Example:
 
-        get_record_field_value({
+        get_object_field_value({
                                  "id": 1,
                                  "project": "AsterixDB",
                                  "address": {"city": "Irvine", "state": "CA"},
@@ -102,28 +102,28 @@
 
         "AsterixDB"
 
-### record_remove_fields ###
+### object_remove_fields ###
  * Syntax:
 
-        record_remove_fields(input_record, field_names)
+        object_remove_fields(input_object, field_names)
 
- * Remove indicated fields from a record given a list of field names.
+ * Remove indicated fields from a object given a list of field names.
  * Arguments:
-    * `input_record`:  a record value.
+    * `input_object`:  a object value.
     * `field_names`: an array of strings and/or array of array of strings.
 
  * Return Value:
-    * a new record value without the fields listed in the second argument,
+    * a new object value without the fields listed in the second argument,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
+        * the first argument is any other non-object value,
         * or, the second argument is any other non-array value or recursively contains non-string items.
 
 
  * Example:
 
-        record_remove_fields(
+        object_remove_fields(
                                {
                                  "id":1,
                                  "project":"AsterixDB",
@@ -141,27 +141,27 @@
           "address":{ "state": "CA" }
         }
 
-### record_add_fields ###
+### object_add_fields ###
  * Syntax:
 
-        record_add_fields(input_record, fields)
+        object_add_fields(input_object, fields)
 
- * Add fields to a record given a list of field names.
+ * Add fields to a object given a list of field names.
  * Arguments:
-    * `input_record` : a record value.
-    * `fields`: an array of field descriptor records where each record has field_name and  field_value.
+    * `input_object` : a object value.
+    * `fields`: an array of field descriptor objects where each object has field_name and  field_value.
  * Return Value:
-    * a new record value with the new fields included,
+    * a new object value with the new fields included,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` value,
     * a type error will be raised if:
-        * the first argument is any other non-record value,
-        * the second argument is any other non-array value, or contains non-record items.
+        * the first argument is any other non-object value,
+        * the second argument is any other non-array value, or contains non-object items.
 
 
  * Example:
 
-        record_add_fields(
+        object_add_fields(
                            {
                              "id":1,
                              "project":"AsterixDB",
@@ -181,26 +181,26 @@
            "employment_location": point("30.0,70.0")
          }
 
-### record_merge ###
+### object_merge ###
  * Syntax:
 
-        record_merge(record1, record2)
+        object_merge(object1, object2)
 
- * Merge two different records into a new record.
+ * Merge two different objects into a new object.
  * Arguments:
-    * `record1` : a record value.
-    * `record2` : a record value.
+    * `object1` : a object value.
+    * `object2` : a object value.
  * Return Value:
-    * a new record value with fields from both input records. If a field’s names in both records are the same,
+    * a new object value with fields from both input objects. If a field’s names in both objects are the same,
       an exception is issued,
     * `missing` if any argument is a `missing` value,
     * `null` if any argument is a `null` value but no argument is a `missing` value,
-    * any other non-record input value will cause a type error.
+    * any other non-object input value will cause a type error.
 
 
  * Example:
 
-        record_merge(
+        object_merge(
                       {
                         "id":1,
                         "project":"AsterixDB",
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
index 811094e..17cf9bf 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/2_expr.md
@@ -33,7 +33,7 @@
 
 The most basic building block for any SQL++ expression is PrimaryExpression. This can be a simple literal (constant)
 value, a reference to a query variable that is in scope, a parenthesized expression, a function call, or a newly
-constructed instance of the data model (such as a newly constructed record, array, or multiset of data model instances).
+constructed instance of the data model (such as a newly constructed object, array, or multiset of data model instances).
 
 ### <a id="Literals">Literals</a>
 
@@ -58,7 +58,7 @@
                      | <DIGITS> ( "." <DIGITS> )?
                      | "." <DIGITS>
 
-Literals (constants) in SQL++ can be strings, integers, floating point values, double values, boolean constants, or special constant values like `NULL` and `MISSING`. The `NULL` value is like a `NULL` in SQL; it is used to represent an unknown field value. The specialy value `MISSING` is only meaningful in the context of SQL++ field accesses; it occurs when the accessed field simply does not exist at all in a record being accessed.
+Literals (constants) in SQL++ can be strings, integers, floating point values, double values, boolean constants, or special constant values like `NULL` and `MISSING`. The `NULL` value is like a `NULL` in SQL; it is used to represent an unknown field value. The specialy value `MISSING` is only meaningful in the context of SQL++ field accesses; it occurs when the accessed field simply does not exist at all in a object being accessed.
 
 The following are some simple examples of SQL++ literals.
 
@@ -115,20 +115,20 @@
     CollectionConstructor    ::= ArrayConstructor | MultisetConstructor
     ArrayConstructor         ::= "[" ( Expression ( "," Expression )* )? "]"
     MultisetConstructor      ::= "{{" ( Expression ( "," Expression )* )? "}}"
-    RecordConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? "}"
+    ObjectConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? "}"
     FieldBinding             ::= Expression ":" Expression
 
 A major feature of SQL++ is its ability to construct new data model instances. This is accomplished using its constructors
-for each of the model's complex object structures, namely arrays, multisets, and records.
+for each of the model's complex object structures, namely arrays, multisets, and objects.
 Arrays are like JSON arrays, while multisets have bag semantics.
-Records are built from fields that are field-name/field-value pairs, again like JSON.
+Objects are built from fields that are field-name/field-value pairs, again like JSON.
 (See the [data model document](../datamodel.html) for more details on each.)
 
-The following examples illustrate how to construct a new array with 3 items, a new record with 2 fields,
+The following examples illustrate how to construct a new array with 3 items, a new object with 2 fields,
 and a new multiset with 4 items, respectively. Array elements or multiset elements can be homogeneous (as in
 the first example),
 which is the common case, or they may be heterogeneous (as in the third example). The data values and field name values
-used to construct arrays, multisets, and records in constructors are all simply SQL++ expressions. Thus, the collection elements,
+used to construct arrays, multisets, and objects in constructors are all simply SQL++ expressions. Thus, the collection elements,
 field names, and field values used in constructors can be simple literals or they can come from query variable references
 or even arbitrarily complex SQL++ expressions (subqueries).
 
@@ -150,12 +150,12 @@
     Index           ::= "[" ( Expression | "?" ) "]"
 
 Components of complex types in the data model are accessed via path expressions. Path access can be applied to the result
-of a SQL++ expression that yields an instance of  a complex type, e.g., a record or array instance. For records,
+of a SQL++ expression that yields an instance of  a complex type, e.g., a object or array instance. For objects,
 path access is based on field names. For arrays, path access is based on (zero-based) array-style indexing.
 SQL++ also supports an "I'm feeling lucky" style index accessor, [?], for selecting an arbitrary element from an array.
  Attempts to access non-existent fields or out-of-bound array elements produce the special value `MISSING`.
 
-The following examples illustrate field access for a record, index-based element access for an array, and also a
+The following examples illustrate field access for a object, index-based element access for an array, and also a
 composition thereof.
 
 ##### Examples
@@ -220,7 +220,7 @@
 | NOT EXISTS |  Check whether a collection is empty         | SELECT * FROM ChirpMessages cm <br/>WHERE NOT EXISTS cm.referredTopics; |
 
 ### <a id="Comparison_operators">Comparison operators</a>
-Comparison operators are used to compare values. The comparison operators fall into one of two sub-categories: missing value comparisons and regular value comparisons. SQL++ (and JSON) has two ways of representing missing information in a record - the presence of the field with a NULL for its value (as in SQL), and the absence of the field (which JSON permits). For example, the first of the following records represents Jack, whose friend is Jill. In the other examples, Jake is friendless a la SQL, with a friend field that is NULL, while Joe is friendless in a more natural (for JSON) way, i.e., by not having a friend field.
+Comparison operators are used to compare values. The comparison operators fall into one of two sub-categories: missing value comparisons and regular value comparisons. SQL++ (and JSON) has two ways of representing missing information in a object - the presence of the field with a NULL for its value (as in SQL), and the absence of the field (which JSON permits). For example, the first of the following objects represents Jack, whose friend is Jill. In the other examples, Jake is friendless a la SQL, with a friend field that is NULL, while Joe is friendless in a more natural (for JSON) way, i.e., by not having a friend field.
 
 ##### Examples
 {"name": "Jack", "friend": "Jill"}
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
index 5ca0e1f..85787e8 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/3_query.md
@@ -72,23 +72,23 @@
     OrderbyClause      ::= <ORDER> <BY> Expression ( <ASC> | <DESC> )? ( "," Expression ( <ASC> | <DESC> )? )*
     LimitClause        ::= <LIMIT> Expression ( <OFFSET> Expression )?
 
-In this section, we will make use of two stored collections of records (datasets), `GleambookUsers` and `GleambookMessages`, in a series of running examples to explain `SELECT` queries. The contents of the example collections are as follows:
+In this section, we will make use of two stored collections of objects (datasets), `GleambookUsers` and `GleambookMessages`, in a series of running examples to explain `SELECT` queries. The contents of the example collections are as follows:
 
 `GleambookUsers` collection:
 
-    {"id":1,"alias":"Margarita","name":"MargaritaStoddard","nickname":"Mags","userSince":datetime("2012-08-20T10:10:00"),"friendIds":{{2,3,6,10}},"employment":[{"organizationName":"Codetechno","start-date":date("2006-08-06")},{"organizationName":"geomedia","start-date":date("2010-06-17"),"end-date":date("2010-01-26")}],"gender":"F"}
-    {"id":2,"alias":"Isbel","name":"IsbelDull","nickname":"Izzy","userSince":datetime("2011-01-22T10:10:00"),"friendIds":{{1,4}},"employment":[{"organizationName":"Hexviafind","startDate":date("2010-04-27")}]}
-    {"id":3,"alias":"Emory","name":"EmoryUnk","userSince":datetime("2012-07-10T10:10:00"),"friendIds":{{1,5,8,9}},"employment":[{"organizationName":"geomedia","startDate":date("2010-06-17"),"endDate":date("2010-01-26")}]}
+    {"id":1,"alias":"Margarita","name":"MargaritaStoddard","nickname":"Mags","userSince":"2012-08-20T10:10:00","friendIds":[2,3,6,10],"employment":[{"organizationName":"Codetechno","start-date":"2006-08-06"},{"organizationName":"geomedia","start-date":"2010-06-17","end-date":"2010-01-26"}],"gender":"F"}
+    {"id":2,"alias":"Isbel","name":"IsbelDull","nickname":"Izzy","userSince":"2011-01-22T10:10:00","friendIds":[1,4],"employment":[{"organizationName":"Hexviafind","startDate":"2010-04-27"}]}
+    {"id":3,"alias":"Emory","name":"EmoryUnk","userSince":"2012-07-10T10:10:00","friendIds":[1,5,8,9],"employment":[{"organizationName":"geomedia","startDate":"2010-06-17","endDate":"2010-01-26"}]}
 
 `GleambookMessages` collection:
 
-    {"messageId":2,"authorId":1,"inResponseTo":4,"senderLocation":point("41.66,80.87"),"message":" dislike iphone its touch-screen is horrible"}
-    {"messageId":3,"authorId":2,"inResponseTo":4,"senderLocation":point("48.09,81.01"),"message":" like samsung the plan is amazing"}
-    {"messageId":4,"authorId":1,"inResponseTo":2,"senderLocation":point("37.73,97.04"),"message":" can't stand at&t the network is horrible:("}
-    {"messageId":6,"authorId":2,"inResponseTo":1,"senderLocation":point("31.5,75.56"),"message":" like t-mobile its platform is mind-blowing"}
-    {"messageId":8,"authorId":1,"inResponseTo":11,"senderLocation":point("40.33,80.87"),"message":" like verizon the 3G is awesome:)"}
-    {"messageId":10,"authorId":1,"inResponseTo":12,"senderLocation":point("42.5,70.01"),"message":" can't stand motorola the touch-screen is terrible"}
-    {"messageId":11,"authorId":1,"inResponseTo":1,"senderLocation":point("38.97,77.49"),"message":" can't stand at&t its plan is terrible"}
+    {"messageId":2,"authorId":1,"inResponseTo":4,"senderLocation":[41.66,80.87],"message":" dislike iphone its touch-screen is horrible"}
+    {"messageId":3,"authorId":2,"inResponseTo":4,"senderLocation":[48.09,81.01],"message":" like samsung the plan is amazing"}
+    {"messageId":4,"authorId":1,"inResponseTo":2,"senderLocation":[37.73,97.04],"message":" can't stand at&t the network is horrible:("}
+    {"messageId":6,"authorId":2,"inResponseTo":1,"senderLocation":[31.5,75.56],"message":" like t-mobile its platform is mind-blowing"}
+    {"messageId":8,"authorId":1,"inResponseTo":11,"senderLocation":[40.33,80.87],"message":" like verizon the 3G is awesome:)"}
+    {"messageId":10,"authorId":1,"inResponseTo":12,"senderLocation":[42.5,70.01],"message":" can't stand motorola the touch-screen is terrible"}
+    {"messageId":11,"authorId":1,"inResponseTo":1,"senderLocation":[38.97,77.49],"message":" can't stand at&t its plan is terrible"}
 
 ## <a id="Select_clauses">SELECT Clause</a>
 The SQL++ `SELECT` clause always returns a collection value as its result (even if the result is empty or a singleton).
@@ -107,29 +107,29 @@
 This query returns:
 
     [{
-    	"userSince": "2012-08-20T10:10:00.000Z",
-    	"friendIds": [
-    		2,
-    		3,
-    		6,
-    		10
-    	],
-    	"gender": "F",
-    	"name": "MargaritaStoddard",
-    	"nickname": "Mags",
-    	"alias": "Margarita",
-    	"id": 1,
-    	"employment": [
-    		{
-    			"organizationName": "Codetechno",
-    			"start-date": "2006-08-06"
-    		},
-    		{
-    			"end-date": "2010-01-26",
-    			"organizationName": "geomedia",
-    			"start-date": "2010-06-17"
-    		}
-    	]
+        "userSince": "2012-08-20T10:10:00.000Z",
+        "friendIds": [
+            2,
+            3,
+            6,
+            10
+        ],
+        "gender": "F",
+        "name": "MargaritaStoddard",
+        "nickname": "Mags",
+        "alias": "Margarita",
+        "id": 1,
+        "employment": [
+            {
+                "organizationName": "Codetechno",
+                "start-date": "2006-08-06"
+            },
+            {
+                "end-date": "2010-01-26",
+                "organizationName": "geomedia",
+                "start-date": "2010-06-17"
+            }
+        ]
     } ]
 
 ### <a id="SQL_select">SQL-style SELECT</a>
@@ -145,12 +145,12 @@
 Returns:
 
     [ {
-    	"user_name": "MargaritaStoddard",
-    	"user_alias": "Margarita"
+        "user_name": "MargaritaStoddard",
+        "user_alias": "Margarita"
     } ]
 
 ### <a id="Select_star">SELECT *</a>
-In SQL++, `SELECT *` returns a record with a nested field for each input tuple. Each field has as its field name the name of a binding variable generated by either the `FROM` clause or `GROUP BY` clause in the current enclosing `SELECT` statement, and its field is the value of that binding variable.
+In SQL++, `SELECT *` returns a object with a nested field for each input tuple. Each field has as its field name the name of a binding variable generated by either the `FROM` clause or `GROUP BY` clause in the current enclosing `SELECT` statement, and its field is the value of that binding variable.
 
 ##### Example
 
@@ -160,69 +160,69 @@
 Since `user` is the only binding variable generated in the `FROM` clause, this query returns:
 
     [ {
-    	"user": {
-    		"userSince": "2012-08-20T10:10:00.000Z",
-    		"friendIds": [
-    			2,
-    			3,
-    			6,
-    			10
-    		],
-    		"gender": "F",
-    		"name": "MargaritaStoddard",
-    		"nickname": "Mags",
-    		"alias": "Margarita",
-    		"id": 1,
-    		"employment": [
-    			{
-    				"organizationName": "Codetechno",
-    				"start-date": "2006-08-06"
-    			},
-    			{
-    				"end-date": "2010-01-26",
-    				"organizationName": "geomedia",
-    				"start-date": "2010-06-17"
-    			}
-    		]
-    	}
+        "user": {
+            "userSince": "2012-08-20T10:10:00.000Z",
+            "friendIds": [
+                2,
+                3,
+                6,
+                10
+            ],
+            "gender": "F",
+            "name": "MargaritaStoddard",
+            "nickname": "Mags",
+            "alias": "Margarita",
+            "id": 1,
+            "employment": [
+                {
+                    "organizationName": "Codetechno",
+                    "start-date": "2006-08-06"
+                },
+                {
+                    "end-date": "2010-01-26",
+                    "organizationName": "geomedia",
+                    "start-date": "2010-06-17"
+                }
+            ]
+        }
     }, {
-    	"user": {
-    		"userSince": "2011-01-22T10:10:00.000Z",
-    		"friendIds": [
-    			1,
-    			4
-    		],
-    		"name": "IsbelDull",
-    		"nickname": "Izzy",
-    		"alias": "Isbel",
-    		"id": 2,
-    		"employment": [
-    			{
-    				"organizationName": "Hexviafind",
-    				"startDate": "2010-04-27"
-    			}
-    		]
-    	}
+        "user": {
+            "userSince": "2011-01-22T10:10:00.000Z",
+            "friendIds": [
+                1,
+                4
+            ],
+            "name": "IsbelDull",
+            "nickname": "Izzy",
+            "alias": "Isbel",
+            "id": 2,
+            "employment": [
+                {
+                    "organizationName": "Hexviafind",
+                    "startDate": "2010-04-27"
+                }
+            ]
+        }
     }, {
-    	"user": {
-    		"userSince": "2012-07-10T10:10:00.000Z",
-    		"friendIds": [
-    			1,
-    			5,
-    			8,
-    			9
-    		],
-    		"name": "EmoryUnk",
-    		"alias": "Emory",
-    		"id": 3,
-    		"employment": [
-    			{
-    				"organizationName": "geomedia",
-    				"endDate": "2010-01-26",
-    				"startDate": "2010-06-17"
-    			}
-    		]
-    	}
+        "user": {
+            "userSince": "2012-07-10T10:10:00.000Z",
+            "friendIds": [
+                1,
+                5,
+                8,
+                9
+            ],
+            "name": "EmoryUnk",
+            "alias": "Emory",
+            "id": 3,
+            "employment": [
+                {
+                    "organizationName": "geomedia",
+                    "endDate": "2010-01-26",
+                    "startDate": "2010-06-17"
+                }
+            ]
+        }
     } ]
 
 ### <a id="Select_distinct">SELECT DISTINCT</a>
@@ -235,11 +235,11 @@
 This query returns:
 
     [ {
-    	"foo": 1
+        "foo": 1
     }, {
-    	"foo": 2
+        "foo": 2
     }, {
-    	"foo": 3
+        "foo": 3
     } ]
 
 ##### Example
@@ -270,8 +270,8 @@
 This query outputs:
 
     [ {
-    	"alias": "Margarita",
-    	"$1": "Stoddard"
+        "alias": "Margarita",
+        "$1": "Stoddard"
     } ]
 
 In the result, `$1` is the generated name for `substr(user.name, 1)`, while `alias` is the generated name for `user.alias`.
@@ -288,15 +288,15 @@
 Outputs:
 
     [ {
-    	"lname": "Stoddard",
-    	"alias": "Margarita"
+        "lname": "Stoddard",
+        "alias": "Margarita"
     } ]
 
 ## <a id="Unnest_clauses">UNNEST Clause</a>
 For each of its input tuples, the `UNNEST` clause flattens a collection-valued expression into individual items, producing multiple tuples, each of which is one of the expression's original input tuples augmented with a flattened item from its collection.
 
 ### <a id="Inner_unnests">Inner UNNEST</a>
-The following example is a query that retrieves the names of the organizations that a selected user has worked for. It uses the `UNNEST` clause to unnest the nested collection `employment` in the user's record.
+The following example is a query that retrieves the names of the organizations that a selected user has worked for. It uses the `UNNEST` clause to unnest the nested collection `employment` in the user's object.
 
 ##### Example
 
@@ -308,17 +308,17 @@
 This query returns:
 
     [ {
-    	"orgName": "Codetechno",
-    	"userId": 1
+        "orgName": "Codetechno",
+        "userId": 1
     }, {
-    	"orgName": "geomedia",
-    	"userId": 1
+        "orgName": "geomedia",
+        "userId": 1
     } ]
 
 Note that `UNNEST` has SQL's inner join semantics --- that is, if a user has no employment history, no tuple corresponding to that user will be emitted in the result.
 
 ### <a id="Left_outer_unnests">Left outer UNNEST</a>
-As an alternative, the `LEFT OUTER UNNEST` clause offers SQL's left outer join semantics. For example, no collection-valued field named `hobbies` exists in the record for the user whose id is 1, but the following query's result still includes user 1.
+As an alternative, the `LEFT OUTER UNNEST` clause offers SQL's left outer join semantics. For example, no collection-valued field named `hobbies` exists in the object for the user whose id is 1, but the following query's result still includes user 1.
 
 ##### Example
 
@@ -330,14 +330,14 @@
 Returns:
 
     [ {
-    	"userId": 1
+        "userId": 1
     } ]
 
 Note that if `u.hobbies` is an empty collection or leads to a `MISSING` (as above) or `NULL` value for a given input tuple, there is no corresponding binding value for variable `h` for an input tuple. A `MISSING` value will be generated for `h` so that the input tuple can still be propagated.
 
 ### <a id="Expressing_joins_using_unnests">Expressing joins using UNNEST</a>
 The SQL++ `UNNEST` clause is similar to SQL's `JOIN` clause except that it allows its right argument to be correlated to its left argument, as in the examples above --- i.e., think "correlated cross-product".
-The next example shows this via a query that joins two data sets, GleambookUsers and GleambookMessages, returning user/message pairs. The results contain one record per pair, with result records containing the user's name and an entire message. The query can be thought of as saying "for each Gleambook user, unnest the `GleambookMessages` collection and filter the output with the condition `message.authorId = user.id`".
+The next example shows this via a query that joins two data sets, GleambookUsers and GleambookMessages, returning user/message pairs. The results contain one object per pair, with result objects containing the user's name and an entire message. The query can be thought of as saying "for each Gleambook user, unnest the `GleambookMessages` collection and filter the output with the condition `message.authorId = user.id`".
 
 ##### Example
 
@@ -349,26 +349,26 @@
 This returns:
 
     [ {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand at&t its plan is terrible"
+        "uname": "MargaritaStoddard",
+        "message": " can't stand at&t its plan is terrible"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " dislike iphone its touch-screen is horrible"
+        "uname": "MargaritaStoddard",
+        "message": " dislike iphone its touch-screen is horrible"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand at&t the network is horrible:("
+        "uname": "MargaritaStoddard",
+        "message": " can't stand at&t the network is horrible:("
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " like verizon the 3G is awesome:)"
+        "uname": "MargaritaStoddard",
+        "message": " like verizon the 3G is awesome:)"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand motorola the touch-screen is terrible"
+        "uname": "MargaritaStoddard",
+        "message": " can't stand motorola the touch-screen is terrible"
     }, {
-    	"uname": "IsbelDull",
-    	"message": " like t-mobile its platform is mind-blowing"
+        "uname": "IsbelDull",
+        "message": " like t-mobile its platform is mind-blowing"
     }, {
-    	"uname": "IsbelDull",
-    	"message": " like samsung the plan is amazing"
+        "uname": "IsbelDull",
+        "message": " like samsung the plan is amazing"
     } ]
 
 Similarly, the above query can also be expressed as the `UNNEST`ing of a correlated SQL++ subquery:
@@ -451,26 +451,26 @@
 Returns:
 
     [ {
-    	"name": "MargaritaStoddard",
-    	"message": " like verizon the 3G is awesome:)"
+        "name": "MargaritaStoddard",
+        "message": " like verizon the 3G is awesome:)"
     }, {
-    	"name": "MargaritaStoddard",
-    	"message": " can't stand motorola the touch-screen is terrible"
+        "name": "MargaritaStoddard",
+        "message": " can't stand motorola the touch-screen is terrible"
     }, {
-    	"name": "MargaritaStoddard",
-    	"message": " can't stand at&t its plan is terrible"
+        "name": "MargaritaStoddard",
+        "message": " can't stand at&t its plan is terrible"
     }, {
-    	"name": "MargaritaStoddard",
-    	"message": " dislike iphone its touch-screen is horrible"
+        "name": "MargaritaStoddard",
+        "message": " dislike iphone its touch-screen is horrible"
     }, {
-    	"name": "MargaritaStoddard",
-    	"message": " can't stand at&t the network is horrible:("
+        "name": "MargaritaStoddard",
+        "message": " can't stand at&t the network is horrible:("
     }, {
-    	"name": "IsbelDull",
-    	"message": " like samsung the plan is amazing"
+        "name": "IsbelDull",
+        "message": " like samsung the plan is amazing"
     }, {
-    	"name": "IsbelDull",
-    	"message": " like t-mobile its platform is mind-blowing"
+        "name": "IsbelDull",
+        "message": " like t-mobile its platform is mind-blowing"
     } ]
 
 ##### Example
@@ -508,31 +508,31 @@
 Returns:
 
     [ {
-    	"uname": "MargaritaStoddard",
-    	"message": " like verizon the 3G is awesome:)"
+        "uname": "MargaritaStoddard",
+        "message": " like verizon the 3G is awesome:)"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand motorola the touch-screen is terrible"
+        "uname": "MargaritaStoddard",
+        "message": " can't stand motorola the touch-screen is terrible"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand at&t its plan is terrible"
+        "uname": "MargaritaStoddard",
+        "message": " can't stand at&t its plan is terrible"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " dislike iphone its touch-screen is horrible"
+        "uname": "MargaritaStoddard",
+        "message": " dislike iphone its touch-screen is horrible"
     }, {
-    	"uname": "MargaritaStoddard",
-    	"message": " can't stand at&t the network is horrible:("
+        "uname": "MargaritaStoddard",
+        "message": " can't stand at&t the network is horrible:("
     }, {
-    	"uname": "IsbelDull",
-    	"message": " like samsung the plan is amazing"
+        "uname": "IsbelDull",
+        "message": " like samsung the plan is amazing"
     }, {
-    	"uname": "IsbelDull",
-    	"message": " like t-mobile its platform is mind-blowing"
+        "uname": "IsbelDull",
+        "message": " like t-mobile its platform is mind-blowing"
     }, {
-    	"uname": "EmoryUnk"
+        "uname": "EmoryUnk"
     } ]
 
-For non-matching left-side tuples, SQL++ produces `MISSING` values for the right-side binding variables; that is why the last record in the above result doesn't have a `message` field. Note that this is slightly different from standard SQL, which instead would fill in `NULL` values for the right-side fields. The reason for this difference is that, for non-matches in its join results, SQL++ views fields from the right-side as being "not there" (a.k.a. `MISSING`) instead of as being "there but unknown" (i.e., `NULL`).
+For non-matching left-side tuples, SQL++ produces `MISSING` values for the right-side binding variables; that is why the last object in the above result doesn't have a `message` field. Note that this is slightly different from standard SQL, which instead would fill in `NULL` values for the right-side fields. The reason for this difference is that, for non-matches in its join results, SQL++ views fields from the right-side as being "not there" (a.k.a. `MISSING`) instead of as being "there but unknown" (i.e., `NULL`).
 
 The left-outer join query can also be expressed using `LEFT OUTER UNNEST`:
 
@@ -551,7 +551,7 @@
 
 ### <a id="Group_variables">Group variables</a>
 In a `GROUP BY` clause, in addition to the binding variable(s) defined for the grouping key(s), SQL++ allows a user to define a *group variable* by using the clause's `GROUP AS` extension to denote the resulting group.
-After grouping, then, the query's in-scope variables include the grouping key's binding variables as well as this group variable which will be bound to one collection value for each group. This per-group collection value will be a set of nested records in which each field of the record is the result of a renamed variable defined in parentheses following the group variable's name. The `GROUP AS` syntax is as follows:
+After grouping, then, the query's in-scope variables include the grouping key's binding variables as well as this group variable which will be bound to one collection value for each group. This per-group collection value will be a set of nested objects in which each field of the object is the result of a renamed variable defined in parentheses following the group variable's name. The `GROUP AS` syntax is as follows:
 
     <GROUP> <AS> Variable ("(" Variable <AS> VariableReference ("," Variable <AS> VariableReference )* ")")?
 
@@ -564,108 +564,108 @@
 This first example query returns:
 
     [ {
-    	"msgs": [
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					38.97,
-    					77.49
-    				],
-    				"inResponseTo": 1,
-    				"messageId": 11,
-    				"authorId": 1,
-    				"message": " can't stand at&t its plan is terrible"
-    			}
-    		},
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					41.66,
-    					80.87
-    				],
-    				"inResponseTo": 4,
-    				"messageId": 2,
-    				"authorId": 1,
-    				"message": " dislike iphone its touch-screen is horrible"
-    			}
-    		},
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					37.73,
-    					97.04
-    				],
-    				"inResponseTo": 2,
-    				"messageId": 4,
-    				"authorId": 1,
-    				"message": " can't stand at&t the network is horrible:("
-    			}
-    		},
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					40.33,
-    					80.87
-    				],
-    				"inResponseTo": 11,
-    				"messageId": 8,
-    				"authorId": 1,
-    				"message": " like verizon the 3G is awesome:)"
-    			}
-    		},
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					42.5,
-    					70.01
-    				],
-    				"inResponseTo": 12,
-    				"messageId": 10,
-    				"authorId": 1,
-    				"message": " can't stand motorola the touch-screen is terrible"
-    			}
-    		}
-    	],
-    	"uid": 1
+        "msgs": [
+            {
+                "msg": {
+                    "senderLocation": [
+                        38.97,
+                        77.49
+                    ],
+                    "inResponseTo": 1,
+                    "messageId": 11,
+                    "authorId": 1,
+                    "message": " can't stand at&t its plan is terrible"
+                }
+            },
+            {
+                "msg": {
+                    "senderLocation": [
+                        41.66,
+                        80.87
+                    ],
+                    "inResponseTo": 4,
+                    "messageId": 2,
+                    "authorId": 1,
+                    "message": " dislike iphone its touch-screen is horrible"
+                }
+            },
+            {
+                "msg": {
+                    "senderLocation": [
+                        37.73,
+                        97.04
+                    ],
+                    "inResponseTo": 2,
+                    "messageId": 4,
+                    "authorId": 1,
+                    "message": " can't stand at&t the network is horrible:("
+                }
+            },
+            {
+                "msg": {
+                    "senderLocation": [
+                        40.33,
+                        80.87
+                    ],
+                    "inResponseTo": 11,
+                    "messageId": 8,
+                    "authorId": 1,
+                    "message": " like verizon the 3G is awesome:)"
+                }
+            },
+            {
+                "msg": {
+                    "senderLocation": [
+                        42.5,
+                        70.01
+                    ],
+                    "inResponseTo": 12,
+                    "messageId": 10,
+                    "authorId": 1,
+                    "message": " can't stand motorola the touch-screen is terrible"
+                }
+            }
+        ],
+        "uid": 1
     }, {
-    	"msgs": [
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					31.5,
-    					75.56
-    				],
-    				"inResponseTo": 1,
-    				"messageId": 6,
-    				"authorId": 2,
-    				"message": " like t-mobile its platform is mind-blowing"
-    			}
-    		},
-    		{
-    			"msg": {
-    				"senderLocation": [
-    					48.09,
-    					81.01
-    				],
-    				"inResponseTo": 4,
-    				"messageId": 3,
-    				"authorId": 2,
-    				"message": " like samsung the plan is amazing"
-    			}
-    		}
-    	],
-    	"uid": 2
+        "msgs": [
+            {
+                "msg": {
+                    "senderLocation": [
+                        31.5,
+                        75.56
+                    ],
+                    "inResponseTo": 1,
+                    "messageId": 6,
+                    "authorId": 2,
+                    "message": " like t-mobile its platform is mind-blowing"
+                }
+            },
+            {
+                "msg": {
+                    "senderLocation": [
+                        48.09,
+                        81.01
+                    ],
+                    "inResponseTo": 4,
+                    "messageId": 3,
+                    "authorId": 2,
+                    "message": " like samsung the plan is amazing"
+                }
+            }
+        ],
+        "uid": 2
     } ]
 
 As we can see from the above query result, each group in the example query's output has an associated group
 variable value called `msgs` that appears in the `SELECT *`'s result.
-This variable contains a collection of records associated with the group; each of the group's `message` values
-appears in the `msg` field of the records in the `msgs` collection.
+This variable contains a collection of objects associated with the group; each of the group's `message` values
+appears in the `msg` field of the objects in the `msgs` collection.
 
 The group variable in SQL++ makes more complex, composable, nested subqueries over a group possible, which is
 important given the more complex data model of SQL++ (relative to SQL).
 As a simple example of this, as we really just want the messages associated with each user, we might wish to avoid
-the "extra wrapping" of each message as the `msg` field of a record.
+the "extra wrapping" of each message as the `msg` field of a object.
 (That wrapping is useful in more complex cases, but is essentially just in the way here.)
 We can use a subquery in the `SELECT` clase to tunnel through the extra nesting and produce the desired result.
 
@@ -678,83 +678,83 @@
 This variant of the example query returns:
 
        [ {
-       	"msgs": [
-       		{
-       			"senderLocation": [
-       				38.97,
-       				77.49
-       			],
-       			"inResponseTo": 1,
-       			"messageId": 11,
-       			"authorId": 1,
-       			"message": " can't stand at&t its plan is terrible"
-       		},
-       		{
-       			"senderLocation": [
-       				41.66,
-       				80.87
-       			],
-       			"inResponseTo": 4,
-       			"messageId": 2,
-       			"authorId": 1,
-       			"message": " dislike iphone its touch-screen is horrible"
-       		},
-       		{
-       			"senderLocation": [
-       				37.73,
-       				97.04
-       			],
-       			"inResponseTo": 2,
-       			"messageId": 4,
-       			"authorId": 1,
-       			"message": " can't stand at&t the network is horrible:("
-       		},
-       		{
-       			"senderLocation": [
-       				40.33,
-       				80.87
-       			],
-       			"inResponseTo": 11,
-       			"messageId": 8,
-       			"authorId": 1,
-       			"message": " like verizon the 3G is awesome:)"
-       		},
-       		{
-       			"senderLocation": [
-       				42.5,
-       				70.01
-       			],
-       			"inResponseTo": 12,
-       			"messageId": 10,
-       			"authorId": 1,
-       			"message": " can't stand motorola the touch-screen is terrible"
-       		}
-       	],
-       	"uid": 1
+           "msgs": [
+               {
+                   "senderLocation": [
+                       38.97,
+                       77.49
+                   ],
+                   "inResponseTo": 1,
+                   "messageId": 11,
+                   "authorId": 1,
+                   "message": " can't stand at&t its plan is terrible"
+               },
+               {
+                   "senderLocation": [
+                       41.66,
+                       80.87
+                   ],
+                   "inResponseTo": 4,
+                   "messageId": 2,
+                   "authorId": 1,
+                   "message": " dislike iphone its touch-screen is horrible"
+               },
+               {
+                   "senderLocation": [
+                       37.73,
+                       97.04
+                   ],
+                   "inResponseTo": 2,
+                   "messageId": 4,
+                   "authorId": 1,
+                   "message": " can't stand at&t the network is horrible:("
+               },
+               {
+                   "senderLocation": [
+                       40.33,
+                       80.87
+                   ],
+                   "inResponseTo": 11,
+                   "messageId": 8,
+                   "authorId": 1,
+                   "message": " like verizon the 3G is awesome:)"
+               },
+               {
+                   "senderLocation": [
+                       42.5,
+                       70.01
+                   ],
+                   "inResponseTo": 12,
+                   "messageId": 10,
+                   "authorId": 1,
+                   "message": " can't stand motorola the touch-screen is terrible"
+               }
+           ],
+           "uid": 1
        }, {
-       	"msgs": [
-       		{
-       			"senderLocation": [
-       				31.5,
-       				75.56
-       			],
-       			"inResponseTo": 1,
-       			"messageId": 6,
-       			"authorId": 2,
-       			"message": " like t-mobile its platform is mind-blowing"
-       		},
-       		{
-       			"senderLocation": [
-       				48.09,
-       				81.01
-       			],
-       			"inResponseTo": 4,
-       			"messageId": 3,
-       			"authorId": 2,
-       			"message": " like samsung the plan is amazing"
-       		}
-       	],
-       	"uid": 2
+           "msgs": [
+               {
+                   "senderLocation": [
+                       31.5,
+                       75.56
+                   ],
+                   "inResponseTo": 1,
+                   "messageId": 6,
+                   "authorId": 2,
+                   "message": " like t-mobile its platform is mind-blowing"
+               },
+               {
+                   "senderLocation": [
+                       48.09,
+                       81.01
+                   ],
+                   "inResponseTo": 4,
+                   "messageId": 3,
+                   "authorId": 2,
+                   "message": " like samsung the plan is amazing"
+               }
+           ],
+           "uid": 2
        } ]
 
 Because this is a fairly common case, a third variant with output identical to the second variant is also possible:
@@ -786,43 +786,43 @@
 This example query returns:
 
     [ {
-    	"msgs": [
-    		{
-    			"senderLocation": [
-    				40.33,
-    				80.87
-    			],
-    			"inResponseTo": 11,
-    			"messageId": 8,
-    			"authorId": 1,
-    			"message": " like verizon the 3G is awesome:)"
-    		}
-    	],
-    	"uid": 1
+        "msgs": [
+            {
+                "senderLocation": [
+                    40.33,
+                    80.87
+                ],
+                "inResponseTo": 11,
+                "messageId": 8,
+                "authorId": 1,
+                "message": " like verizon the 3G is awesome:)"
+            }
+        ],
+        "uid": 1
     }, {
-    	"msgs": [
-    		{
-    			"senderLocation": [
-    				48.09,
-    				81.01
-    			],
-    			"inResponseTo": 4,
-    			"messageId": 3,
-    			"authorId": 2,
-    			"message": " like samsung the plan is amazing"
-    		},
-    		{
-    			"senderLocation": [
-    				31.5,
-    				75.56
-    			],
-    			"inResponseTo": 1,
-    			"messageId": 6,
-    			"authorId": 2,
-    			"message": " like t-mobile its platform is mind-blowing"
-    		}
-    	],
-    	"uid": 2
+        "msgs": [
+            {
+                "senderLocation": [
+                    48.09,
+                    81.01
+                ],
+                "inResponseTo": 4,
+                "messageId": 3,
+                "authorId": 2,
+                "message": " like samsung the plan is amazing"
+            },
+            {
+                "senderLocation": [
+                    31.5,
+                    75.56
+                ],
+                "inResponseTo": 1,
+                "messageId": 6,
+                "authorId": 2,
+                "message": " like t-mobile its platform is mind-blowing"
+            }
+        ],
+        "uid": 2
     } ]
 
 ### <a id="Implicit_group_key_variables">Implicit grouping key variables</a>
@@ -850,43 +850,43 @@
 This query returns:
 
         [ {
-    	"msgs": [
-    		{
-    			"senderLocation": [
-    				40.33,
-    				80.87
-    			],
-    			"inResponseTo": 11,
-    			"messageId": 8,
-    			"authorId": 1,
-    			"message": " like verizon the 3G is awesome:)"
-    		}
-    	],
-    	"authorId": 1
+        "msgs": [
+            {
+                "senderLocation": [
+                    40.33,
+                    80.87
+                ],
+                "inResponseTo": 11,
+                "messageId": 8,
+                "authorId": 1,
+                "message": " like verizon the 3G is awesome:)"
+            }
+        ],
+        "authorId": 1
     }, {
-    	"msgs": [
-    		{
-    			"senderLocation": [
-    				48.09,
-    				81.01
-    			],
-    			"inResponseTo": 4,
-    			"messageId": 3,
-    			"authorId": 2,
-    			"message": " like samsung the plan is amazing"
-    		},
-    		{
-    			"senderLocation": [
-    				31.5,
-    				75.56
-    			],
-    			"inResponseTo": 1,
-    			"messageId": 6,
-    			"authorId": 2,
-    			"message": " like t-mobile its platform is mind-blowing"
-    		}
-    	],
-    	"authorId": 2
+        "msgs": [
+            {
+                "senderLocation": [
+                    48.09,
+                    81.01
+                ],
+                "inResponseTo": 4,
+                "messageId": 3,
+                "authorId": 2,
+                "message": " like samsung the plan is amazing"
+            },
+            {
+                "senderLocation": [
+                    31.5,
+                    75.56
+                ],
+                "inResponseTo": 1,
+                "messageId": 6,
+                "authorId": 2,
+                "message": " like t-mobile its platform is mind-blowing"
+            }
+        ],
+        "authorId": 2
     } ]
 
 Based on the three variable generation rules, the generated variable for the grouping key expression `message.authorId`
@@ -913,22 +913,22 @@
 This query returns:
 
     [ {
-    	"msgs": [
-    		{
-    			"message": " like verizon the 3G is awesome:)"
-    		}
-    	],
-    	"uid": 1
+        "msgs": [
+            {
+                "message": " like verizon the 3G is awesome:)"
+            }
+        ],
+        "uid": 1
     }, {
-    	"msgs": [
-    		{
-    			"message": " like samsung the plan is amazing"
-    		},
-    		{
-    			"message": " like t-mobile its platform is mind-blowing"
-    		}
-    	],
-    	"uid": 2
+        "msgs": [
+            {
+                "message": " like samsung the plan is amazing"
+            },
+            {
+                "message": " like t-mobile its platform is mind-blowing"
+            }
+        ],
+        "uid": 2
     } ]
 
 Note that in the query above, in principle, `message` is not an in-scope variable in the `SELECT` clause.
@@ -994,11 +994,11 @@
 This query returns:
 
     [ {
-    	"uid": 1,
-    	"msgCnt": 5
+        "uid": 1,
+        "msgCnt": 5
     }, {
-    	"uid": 2,
-    	"msgCnt": 2
+        "uid": 2,
+        "msgCnt": 2
     } ]
 
 Notice how the query forms groups where each group involves a message author and their messages.
@@ -1045,11 +1045,11 @@
 This query outputs:
 
     [ {
-    	"authorId": 1,
-    	"$1": 5
+        "authorId": 1,
+        "$1": 5
     }, {
-    	"authorId": 2,
-    	"$1": 2
+        "authorId": 2,
+        "$1": 2
     } ]
 
 In principle, a `msg` reference in the query's `SELECT` clause would be "sugarized" as a collection
@@ -1074,11 +1074,11 @@
 This query returns:
 
     [ {
-    	"$1": 5,
-    	"aid": 1
+        "$1": 5,
+        "aid": 1
     }, {
-    	"$1": 2,
-    	"aid": 2
+        "$1": 2,
+        "aid": 2
     } ]
 
 ## <a id="Where_having_clauses">WHERE clauses and HAVING clauses</a>
@@ -1101,63 +1101,63 @@
 This query returns:
 
       [ {
-      	"userSince": "2012-08-20T10:10:00.000Z",
-      	"friendIds": [
-      		2,
-      		3,
-      		6,
-      		10
-      	],
-      	"gender": "F",
-      	"name": "MargaritaStoddard",
-      	"nickname": "Mags",
-      	"alias": "Margarita",
-      	"id": 1,
-      	"employment": [
-      		{
-      			"organizationName": "Codetechno",
-      			"start-date": "2006-08-06"
-      		},
-      		{
-      			"end-date": "2010-01-26",
-      			"organizationName": "geomedia",
-      			"start-date": "2010-06-17"
-      		}
-      	]
+          "userSince": "2012-08-20T10:10:00.000Z",
+          "friendIds": [
+              2,
+              3,
+              6,
+              10
+          ],
+          "gender": "F",
+          "name": "MargaritaStoddard",
+          "nickname": "Mags",
+          "alias": "Margarita",
+          "id": 1,
+          "employment": [
+              {
+                  "organizationName": "Codetechno",
+                  "start-date": "2006-08-06"
+              },
+              {
+                  "end-date": "2010-01-26",
+                  "organizationName": "geomedia",
+                  "start-date": "2010-06-17"
+              }
+          ]
       }, {
-      	"userSince": "2012-07-10T10:10:00.000Z",
-      	"friendIds": [
-      		1,
-      		5,
-      		8,
-      		9
-      	],
-      	"name": "EmoryUnk",
-      	"alias": "Emory",
-      	"id": 3,
-      	"employment": [
-      		{
-      			"organizationName": "geomedia",
-      			"endDate": "2010-01-26",
-      			"startDate": "2010-06-17"
-      		}
-      	]
+          "userSince": "2012-07-10T10:10:00.000Z",
+          "friendIds": [
+              1,
+              5,
+              8,
+              9
+          ],
+          "name": "EmoryUnk",
+          "alias": "Emory",
+          "id": 3,
+          "employment": [
+              {
+                  "organizationName": "geomedia",
+                  "endDate": "2010-01-26",
+                  "startDate": "2010-06-17"
+              }
+          ]
       }, {
-      	"userSince": "2011-01-22T10:10:00.000Z",
-      	"friendIds": [
-      		1,
-      		4
-      	],
-      	"name": "IsbelDull",
-      	"nickname": "Izzy",
-      	"alias": "Isbel",
-      	"id": 2,
-      	"employment": [
-      		{
-      			"organizationName": "Hexviafind",
-      			"startDate": "2010-04-27"
-      		}
-      	]
+          "userSince": "2011-01-22T10:10:00.000Z",
+          "friendIds": [
+              1,
+              4
+          ],
+          "name": "IsbelDull",
+          "nickname": "Izzy",
+          "alias": "Isbel",
+          "id": 2,
+          "employment": [
+              {
+                  "organizationName": "Hexviafind",
+                  "startDate": "2010-04-27"
+              }
+          ]
       } ]
 
 ## <a id="Limit_clauses">LIMIT clauses</a>
@@ -1174,29 +1174,29 @@
 This query returns:
 
       [ {
-      	"userSince": "2012-08-20T10:10:00.000Z",
-      	"friendIds": [
-      		2,
-      		3,
-      		6,
-      		10
-      	],
-      	"gender": "F",
-      	"name": "MargaritaStoddard",
-      	"nickname": "Mags",
-      	"alias": "Margarita",
-      	"id": 1,
-      	"employment": [
-      		{
-      			"organizationName": "Codetechno",
-      			"start-date": "2006-08-06"
-      		},
-      		{
-      			"end-date": "2010-01-26",
-      			"organizationName": "geomedia",
-      			"start-date": "2010-06-17"
-      		}
-      	]
+          "userSince": "2012-08-20T10:10:00.000Z",
+          "friendIds": [
+              2,
+              3,
+              6,
+              10
+          ],
+          "gender": "F",
+          "name": "MargaritaStoddard",
+          "nickname": "Mags",
+          "alias": "Margarita",
+          "id": 1,
+          "employment": [
+              {
+                  "organizationName": "Codetechno",
+                  "start-date": "2006-08-06"
+              },
+              {
+                  "end-date": "2010-01-26",
+                  "organizationName": "geomedia",
+                  "start-date": "2010-06-17"
+              }
+          ]
       } ]
 
 ## <a id="With_clauses">WITH clauses</a>
@@ -1216,47 +1216,47 @@
 This query returns:
 
     [ {
-    	"userSince": "2012-08-20T10:10:00.000Z",
-    	"friendIds": [
-    		2,
-    		3,
-    		6,
-    		10
-    	],
-    	"gender": "F",
-    	"name": "MargaritaStoddard",
-    	"nickname": "Mags",
-    	"alias": "Margarita",
-    	"id": 1,
-    	"employment": [
-    		{
-    			"organizationName": "Codetechno",
-    			"start-date": "2006-08-06"
-    		},
-    		{
-    			"end-date": "2010-01-26",
-    			"organizationName": "geomedia",
-    			"start-date": "2010-06-17"
-    		}
-    	]
+        "userSince": "2012-08-20T10:10:00.000Z",
+        "friendIds": [
+            2,
+            3,
+            6,
+            10
+        ],
+        "gender": "F",
+        "name": "MargaritaStoddard",
+        "nickname": "Mags",
+        "alias": "Margarita",
+        "id": 1,
+        "employment": [
+            {
+                "organizationName": "Codetechno",
+                "start-date": "2006-08-06"
+            },
+            {
+                "end-date": "2010-01-26",
+                "organizationName": "geomedia",
+                "start-date": "2010-06-17"
+            }
+        ]
     }, {
-    	"userSince": "2012-07-10T10:10:00.000Z",
-    	"friendIds": [
-    		1,
-    		5,
-    		8,
-    		9
-    	],
-    	"name": "EmoryUnk",
-    	"alias": "Emory",
-    	"id": 3,
-    	"employment": [
-    		{
-    			"organizationName": "geomedia",
-    			"endDate": "2010-01-26",
-    			"startDate": "2010-06-17"
-    		}
-    	]
+        "userSince": "2012-07-10T10:10:00.000Z",
+        "friendIds": [
+            1,
+            5,
+            8,
+            9
+        ],
+        "name": "EmoryUnk",
+        "alias": "Emory",
+        "id": 3,
+        "employment": [
+            {
+                "organizationName": "geomedia",
+                "endDate": "2010-01-26",
+                "startDate": "2010-06-17"
+            }
+        ]
     } ]
 
 The query is equivalent to the following, more complex, inlined form of the query:
@@ -1297,83 +1297,83 @@
 This query lists `GleambookUsers` that have posted `GleambookMessages` and shows all authored messages for each listed user. It returns:
 
     [ {
-    	"uname": "MargaritaStoddard",
-    	"messages": [
-    		{
-    			"senderLocation": [
-    				38.97,
-    				77.49
-    			],
-    			"inResponseTo": 1,
-    			"messageId": 11,
-    			"authorId": 1,
-    			"message": " can't stand at&t its plan is terrible"
-    		},
-    		{
-    			"senderLocation": [
-    				41.66,
-    				80.87
-    			],
-    			"inResponseTo": 4,
-    			"messageId": 2,
-    			"authorId": 1,
-    			"message": " dislike iphone its touch-screen is horrible"
-    		},
-    		{
-    			"senderLocation": [
-    				37.73,
-    				97.04
-    			],
-    			"inResponseTo": 2,
-    			"messageId": 4,
-    			"authorId": 1,
-    			"message": " can't stand at&t the network is horrible:("
-    		},
-    		{
-    			"senderLocation": [
-    				40.33,
-    				80.87
-    			],
-    			"inResponseTo": 11,
-    			"messageId": 8,
-    			"authorId": 1,
-    			"message": " like verizon the 3G is awesome:)"
-    		},
-    		{
-    			"senderLocation": [
-    				42.5,
-    				70.01
-    			],
-    			"inResponseTo": 12,
-    			"messageId": 10,
-    			"authorId": 1,
-    			"message": " can't stand motorola the touch-screen is terrible"
-    		}
-    	]
+        "uname": "MargaritaStoddard",
+        "messages": [
+            {
+                "senderLocation": [
+                    38.97,
+                    77.49
+                ],
+                "inResponseTo": 1,
+                "messageId": 11,
+                "authorId": 1,
+                "message": " can't stand at&t its plan is terrible"
+            },
+            {
+                "senderLocation": [
+                    41.66,
+                    80.87
+                ],
+                "inResponseTo": 4,
+                "messageId": 2,
+                "authorId": 1,
+                "message": " dislike iphone its touch-screen is horrible"
+            },
+            {
+                "senderLocation": [
+                    37.73,
+                    97.04
+                ],
+                "inResponseTo": 2,
+                "messageId": 4,
+                "authorId": 1,
+                "message": " can't stand at&t the network is horrible:("
+            },
+            {
+                "senderLocation": [
+                    40.33,
+                    80.87
+                ],
+                "inResponseTo": 11,
+                "messageId": 8,
+                "authorId": 1,
+                "message": " like verizon the 3G is awesome:)"
+            },
+            {
+                "senderLocation": [
+                    42.5,
+                    70.01
+                ],
+                "inResponseTo": 12,
+                "messageId": 10,
+                "authorId": 1,
+                "message": " can't stand motorola the touch-screen is terrible"
+            }
+        ]
     }, {
-    	"uname": "IsbelDull",
-    	"messages": [
-    		{
-    			"senderLocation": [
-    				31.5,
-    				75.56
-    			],
-    			"inResponseTo": 1,
-    			"messageId": 6,
-    			"authorId": 2,
-    			"message": " like t-mobile its platform is mind-blowing"
-    		},
-    		{
-    			"senderLocation": [
-    				48.09,
-    				81.01
-    			],
-    			"inResponseTo": 4,
-    			"messageId": 3,
-    			"authorId": 2,
-    			"message": " like samsung the plan is amazing"
-    		}
-    	]
+        "uname": "IsbelDull",
+        "messages": [
+            {
+                "senderLocation": [
+                    31.5,
+                    75.56
+                ],
+                "inResponseTo": 1,
+                "messageId": 6,
+                "authorId": 2,
+                "message": " like t-mobile its platform is mind-blowing"
+            },
+            {
+                "senderLocation": [
+                    48.09,
+                    81.01
+                ],
+                "inResponseTo": 4,
+                "messageId": 3,
+                "authorId": 2,
+                "message": " like samsung the plan is amazing"
+            }
+        ]
     } ]
 
 This query is equivalent to the following query that does not use the `LET` clause:
@@ -1406,7 +1406,7 @@
     [
       " like t-mobile its platform is mind-blowing"
       , {
-    	"uname": "IsbelDull"
+        "uname": "IsbelDull"
     }, " like samsung the plan is amazing"
      ]
 
@@ -1432,24 +1432,24 @@
 For our sample data set, this query returns:
 
     [ {
-    	"msgs": [
-    		{
-    			"senderLocation": [
-    				41.66,
-    				80.87
-    			],
-    			"inResponseTo": 4,
-    			"messageId": 2,
-    			"authorId": 1,
-    			"message": " dislike iphone its touch-screen is horrible"
-    		}
-    	],
-    	"uid": 1
+        "msgs": [
+            {
+                "senderLocation": [
+                    41.66,
+                    80.87
+                ],
+                "inResponseTo": 4,
+                "messageId": 2,
+                "authorId": 1,
+                "message": " dislike iphone its touch-screen is horrible"
+            }
+        ],
+        "uid": 1
     }, {
-    	"msgs": [
+        "msgs": [
 
-    	],
-    	"uid": 2
+        ],
+        "uid": 2
     } ]
 
 Note that a subquery, like a top-level `SELECT` statment, always returns a collection -- regardless of where
@@ -1460,7 +1460,7 @@
 
 | Feature |  SQL++ | SQL-92 |
 |----------|--------|--------|
-| SELECT * | Returns nested records | Returns flattened concatenated records |
+| SELECT * | Returns nested objects | Returns flattened concatenated objects |
 | Subquery | Returns a collection  | The returned collection is cast into a scalar value if the subquery appears in a SELECT list or on one side of a comparison or as input to a function |
 | LEFT OUTER JOIN |  Fills in `MISSING`(s) for non-matches  |   Fills in `NULL`(s) for non-matches    |
 | UNION ALL       | Allows heterogeneous inputs and output | Input streams must be UNION-compatible and output field names are drawn from the first input stream
@@ -1475,5 +1475,5 @@
   * Schema-free: The query language does not assume the existence of a static schema for any data that it processes.
   * Correlated FROM terms: A right-side FROM term expression can refer to variables defined by FROM terms on its left.
   * Powerful GROUP BY: In addition to a set of aggregate functions as in standard SQL, the groups created by the `GROUP BY` clause are directly usable in nested queries and/or to obtain nested results.
-  * Generalized SELECT clause: A SELECT clause can return any type of collection, while in SQL-92, a `SELECT` clause has to return a (homogeneous) collection of records.
+  * Generalized SELECT clause: A SELECT clause can return any type of collection, while in SQL-92, a `SELECT` clause has to return a (homogeneous) collection of objects.
 
diff --git a/asterixdb/asterix-doc/src/main/markdown/sqlpp/5_ddl.md b/asterixdb/asterix-doc/src/main/markdown/sqlpp/5_ddl.md
index d236003..b6577ff 100644
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/5_ddl.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/5_ddl.md
@@ -105,12 +105,12 @@
 
 ### <a id="Types"> Types</a>
 
-    TypeSpecification    ::= "TYPE" FunctionOrTypeName IfNotExists "AS" RecordTypeDef
+    TypeSpecification    ::= "TYPE" FunctionOrTypeName IfNotExists "AS" ObjectTypeDef
     FunctionOrTypeName   ::= QualifiedName
     IfNotExists          ::= ( <IF> <NOT> <EXISTS> )?
-    TypeExpr             ::= RecordTypeDef | TypeReference | ArrayTypeDef | MultisetTypeDef
-    RecordTypeDef        ::= ( <CLOSED> | <OPEN> )? "{" ( RecordField ( "," RecordField )* )? "}"
-    RecordField          ::= Identifier ":" ( TypeExpr ) ( "?" )?
+    TypeExpr             ::= ObjectTypeDef | TypeReference | ArrayTypeDef | MultisetTypeDef
+    ObjectTypeDef        ::= ( <CLOSED> | <OPEN> )? "{" ( ObjectField ( "," ObjectField )* )? "}"
+    ObjectField          ::= Identifier ":" ( TypeExpr ) ( "?" )?
     NestedField          ::= Identifier ( "." Identifier )*
     IndexField           ::= NestedField ( ":" TypeReference )?
     TypeReference        ::= Identifier
@@ -120,17 +120,17 @@
 The CREATE TYPE statement is used to create a new named datatype.
 This type can then be used to create stored collections or utilized when defining one or more other datatypes.
 Much more information about the data model is available in the [data model reference guide](datamodel.html).
-A new type can be a record type, a renaming of another type, an array type, or a multiset type.
-A record type can be defined as being either open or closed.
-Instances of a closed record type are not permitted to contain fields other than those specified in the create type statement.
-Instances of an open record type may carry additional fields, and open is the default for new types if neither option is specified.
+A new type can be a object type, a renaming of another type, an array type, or a multiset type.
+A object type can be defined as being either open or closed.
+Instances of a closed object type are not permitted to contain fields other than those specified in the create type statement.
+Instances of an open object type may carry additional fields, and open is the default for new types if neither option is specified.
 
-The following example creates a new record type called GleambookUser type.
+The following example creates a new object type called GleambookUser type.
 Since it is defined as (defaulting to) being an open type,
 instances will be permitted to contain more than what is specified in the type definition.
 The first four fields are essentially traditional typed name/value pairs (much like SQL fields).
 The friendIds field is a multiset of integers.
-The employment field is an array of instances of another named record type, EmploymentType.
+The employment field is an array of instances of another named object type, EmploymentType.
 
 ##### Example
 
@@ -143,7 +143,7 @@
       employment: [ EmploymentType ]
     };
 
-The next example creates a new record type, closed this time, called MyUserTupleType.
+The next example creates a new object type, closed this time, called MyUserTupleType.
 Instances of this closed type will not be permitted to have extra fields,
 although the alias field is marked as optional and may thus be NULL or MISSING in legal instances of the type.
 Note that the type of the id field in the example is UUID.
@@ -178,16 +178,16 @@
     CompactionPolicy     ::= Identifier
 
 The CREATE DATASET statement is used to create a new dataset.
-Datasets are named, multisets of record type instances;
+Datasets are named, multisets of object type instances;
 they are where data lives persistently and are the usual targets for SQL++ queries.
 Datasets are typed, and the system ensures that their contents conform to their type definitions.
 An Internal dataset (the default kind) is a dataset whose content lives within and is managed by the system.
-It is required to have a specified unique primary key field which uniquely identifies the contained records.
-(The primary key is also used in secondary indexes to identify the indexed primary data records.)
+It is required to have a specified unique primary key field which uniquely identifies the contained objects.
+(The primary key is also used in secondary indexes to identify the indexed primary data objects.)
 
 Internal datasets contain several advanced options that can be specified when appropriate.
 One such option is that random primary key (UUID) values can be auto-generated by declaring the field to be UUID and putting "AUTOGENERATED" after the "PRIMARY KEY" identifier.
-In this case, unlike other non-optional fields, a value for the auto-generated PK field should not be provided at insertion time by the user since each record's primary key field value will be auto-generated by the system.
+In this case, unlike other non-optional fields, a value for the auto-generated PK field should not be provided at insertion time by the user since each object's primary key field value will be auto-generated by the system.
 
 Another advanced option, when creating an Internal dataset, is to specify the merge policy to control which of the
 underlying LSM storage components to be merged.
@@ -214,17 +214,17 @@
 When defining an External dataset, an appropriate adapter type must be selected for the desired external data.
 (See the [Guide to External Data](externaldata.html) for more information on the available adapters.)
 
-The following example creates an Internal dataset for storing FacefookUserType records.
+The following example creates an Internal dataset for storing FacefookUserType objects.
 It specifies that their id field is their primary key.
 
 #### Example
 
     CREATE INTERNAL DATASET GleambookUsers(GleambookUserType) PRIMARY KEY id;
 
-The next example creates another Internal dataset (the default kind when no dataset kind is specified) for storing MyUserTupleType records.
+The next example creates another Internal dataset (the default kind when no dataset kind is specified) for storing MyUserTupleType objects.
 It specifies that the id field should be used as the primary key for the dataset.
 It also specifies that the id field is an auto-generated field,
-meaning that a randomly generated UUID value should be assigned to each incoming record by the system.
+meaning that a randomly generated UUID value should be assigned to each incoming object by the system.
 (A user should therefore not attempt to provide a value for this field.)
 Note that the id field's declared type must be UUID in this case.
 
@@ -232,7 +232,7 @@
 
     CREATE DATASET MyUsers(MyUserTupleType) PRIMARY KEY id AUTOGENERATED;
 
-The next example creates an External dataset for querying LineItemType records.
+The next example creates an External dataset for querying LineItemType objects.
 The choice of the `hdfs` adapter means that this dataset's data actually resides in HDFS.
 The example CREATE statement also provides parameters used by the hdfs adapter:
 the URL and path needed to locate the data in HDFS and a description of the data format.
@@ -264,7 +264,7 @@
 is declared as open **and** if the field's type is provided along with its name and if the `ENFORCED` keyword is
 specified at the end of the index definition.
 `ENFORCING` an open field introduces a check that makes sure that the actual type of the indexed field
-(if the optional field exists in the record) always matches this specified (open) field type.
+(if the optional field exists in the object) always matches this specified (open) field type.
 
 The following example creates a btree index called gbAuthorIdx on the authorId field of the GleambookMessages dataset.
 This index can be useful for accelerating exact-match queries, range search queries, and joins involving the author-id
@@ -282,7 +282,7 @@
     CREATE INDEX gbSendTimeIdx ON GleambookMessages(sendTime: datetime?) TYPE BTREE ENFORCED;
 
 The following example creates a btree index called crpUserScrNameIdx on screenName,
-a nested field residing within a record-valued user field in the ChirpMessages dataset.
+a nested field residing within a object-valued user field in the ChirpMessages dataset.
 This index can be useful for accelerating exact-match queries, range search queries,
 and joins involving the nested screenName field.
 Such nested fields must be singular, i.e., one cannot index through (or on) an array-valued field.
@@ -388,7 +388,7 @@
 This expression can be as simple as a constant expression, or in general it can be any legal SQL++ query.
 If the target dataset has an auto-generated primary key field, the insert statement should not include a
 value for that field in it.
-(The system will automatically extend the provided record with this additional field and a corresponding value.)
+(The system will automatically extend the provided object with this additional field and a corresponding value.)
 Insertion will fail if the dataset already has data with the primary key value(s) being inserted.
 
 Inserts are processed transactionally by the system.
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/externaldata.md b/asterixdb/asterix-doc/src/site/markdown/aql/externaldata.md
index 5095b97..1b3a858 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/externaldata.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/externaldata.md
@@ -34,10 +34,10 @@
 Data that needs to be processed by AsterixDB could be residing outside AsterixDB storage. Examples include data files on a distributed file system such as HDFS or on the local file system of a machine that is part of an AsterixDB cluster. For AsterixDB to process such data, an end-user may create a regular dataset in AsterixDB (a.k.a. an internal dataset) and load the dataset with the data. AsterixDB also supports ‘‘external datasets’’ so that it is not necessary to “load” all data prior to using it. This also avoids creating multiple copies of data and the need to keep the copies in sync.
 
 ### <a id="IntroductionAdapterForAnExternalDataset">Adapter for an External Dataset</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ###
-External data is accessed using wrappers (adapters in AsterixDB) that abstract away the mechanism of connecting with an external service, receiving its data and transforming the data into ADM records that are understood by AsterixDB. AsterixDB comes with built-in adapters for common storage systems such as HDFS or the local file system.
+External data is accessed using wrappers (adapters in AsterixDB) that abstract away the mechanism of connecting with an external service, receiving its data and transforming the data into ADM objects that are understood by AsterixDB. AsterixDB comes with built-in adapters for common storage systems such as HDFS or the local file system.
 
 ### <a id="BuiltinAdapters">Builtin Adapters</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ###
-AsterixDB offers a set of builtin adapters that can be used to query external data or for loading data into an internal dataset using a load statement or a data feed. Each adapter requires specifying the `format` of the data in order to be able to parse records correctly. Using adapters with feeds, the parameter `output-type` must also be specified.
+AsterixDB offers a set of builtin adapters that can be used to query external data or for loading data into an internal dataset using a load statement or a data feed. Each adapter requires specifying the `format` of the data in order to be able to parse objects correctly. Using adapters with feeds, the parameter `output-type` must also be specified.
 
 Following is a listing of existing built-in adapters and their configuration parameters:
 
@@ -76,12 +76,12 @@
 As an example we consider the Lineitem dataset from the [TPCH schema](http://www.openlinksw.com/dataspace/doc/dav/wiki/Main/VOSTPCHLinkedData/tpch.sql).
 We assume that you have successfully created an AsterixDB instance following the instructions at [Installing AsterixDB Using Managix](../install.html). _For constructing an example, we assume a single machine setup.._
 
-Similar to a regular dataset, an external dataset has an associated datatype. We shall first create the datatype associated with each record in Lineitem data. Paste the following in the
+Similar to a regular dataset, an external dataset has an associated datatype. We shall first create the datatype associated with each object in Lineitem data. Paste the following in the
 query textbox on the webpage at http://127.0.0.1:19001 and hit ‘Execute’.
 
         create dataverse ExternalFileDemo;
         use dataverse ExternalFileDemo;
-        
+
         create type LineitemType as closed {
           l_orderkey:int32,
           l_partkey: int32,
@@ -125,8 +125,8 @@
 </tr>
 <tr>
   <td> path </td>
-  <td> A fully qualified path of the form <tt>host://&lt;absolute path&gt;</tt>. 
-  Use a comma separated list if there are multiple files. 
+  <td> A fully qualified path of the form <tt>host://&lt;absolute path&gt;</tt>.
+  Use a comma separated list if there are multiple files.
   E.g. <tt>host1://&lt;absolute path&gt;</tt>, <tt>host2://&lt;absolute path&gt;</tt> and so forth. </td>
 </tr>
 <tr>
@@ -143,7 +143,7 @@
 
 
         use dataverse ExternalFileDemo;
-        
+
         create external dataset Lineitem(LineitemType)
         using localfs
         (("path"="127.0.0.1://SOURCE_PATH"),
@@ -172,8 +172,8 @@
 #### 2) Data file resides on an HDFS instance ####
 rerequisite: It is required that the Namenode and HDFS Datanodes are reachable from the hosts that form the AsterixDB cluster. AsterixDB provides a built-in adapter for data residing on HDFS. The HDFS adapter can be referred (in AQL) by its alias - ‘hdfs’. We can create an external dataset named Lineitem and associate the HDFS adapter with it as follows;
 
-		create external dataset Lineitem(LineitemType) 
-		using hdfs((“hdfs”:”hdfs://localhost:54310”),(“path”:”/asterix/Lineitem.tbl”),...,(“input- format”:”rc-format”));
+        create external dataset Lineitem(LineitemType)
+        using hdfs((“hdfs”:”hdfs://localhost:54310”),(“path”:”/asterix/Lineitem.tbl”),...,(“input- format”:”rc-format”));
 
 The expected parameters are described below:
 
@@ -191,7 +191,7 @@
   <td> The absolute path to the source HDFS file or directory. Use a comma separated list if there are multiple files or directories. </td></tr>
 <tr>
   <td> input-format </td>
-  <td> The associated input format. Use 'text-input-format' for text files , 'sequence-input-format' for hadoop sequence files, 'rc-input-format' for Hadoop Record Columnar files, or a fully qualified name of an implementation of org.apache.hadoop.mapred.InputFormat. </td>
+  <td> The associated input format. Use 'text-input-format' for text files , 'sequence-input-format' for hadoop sequence files, 'rc-input-format' for Hadoop Object Columnar files, or a fully qualified name of an implementation of org.apache.hadoop.mapred.InputFormat. </td>
 </tr>
 <tr>
   <td> format </td>
@@ -203,11 +203,11 @@
 </tr>
 <tr>
   <td> parser </td>
-  <td> The parser used to parse HDFS records if the format is 'binary'. Use 'hive- parser' for data deserialized by a Hive Serde (AsterixDB can understand deserialized Hive objects) or a fully qualified class name of user- implemented parser that implements the interface org.apache.asterix.external.input.InputParser. </td>
+  <td> The parser used to parse HDFS objects if the format is 'binary'. Use 'hive- parser' for data deserialized by a Hive Serde (AsterixDB can understand deserialized Hive objects) or a fully qualified class name of user- implemented parser that implements the interface org.apache.asterix.external.input.InputParser. </td>
 </tr>
 <tr>
   <td> hive-serde </td>
-  <td> The Hive serde is used to deserialize HDFS records if format is binary and the parser is hive-parser. Use a fully qualified name of a class implementation of org.apache.hadoop.hive.serde2.SerDe. </td>
+  <td> The Hive serde is used to deserialize HDFS objects if format is binary and the parser is hive-parser. Use a fully qualified name of a class implementation of org.apache.hadoop.hive.serde2.SerDe. </td>
 </tr>
 <tr>
   <td> local-socket-path </td>
@@ -218,11 +218,11 @@
 *Difference between 'input-format' and 'format'*
 
 *input-format*: Files stored under HDFS have an associated storage format. For example,
-TextInputFormat represents plain text files. SequenceFileInputFormat indicates binary compressed files. RCFileInputFormat corresponds to records stored in a record columnar fashion. The parameter ‘input-format’ is used to distinguish between these and other HDFS input formats.
+TextInputFormat represents plain text files. SequenceFileInputFormat indicates binary compressed files. RCFileInputFormat corresponds to objects stored in a object columnar fashion. The parameter ‘input-format’ is used to distinguish between these and other HDFS input formats.
 
 *format*: The parameter ‘format’ refers to the type of the data contained in the file. For example, data contained in a file could be in json or ADM format, could be in delimited-text with fields separated by a delimiting character or could be in binary format.
 
-As an example. consider the [data file](../data/lineitem.tbl).  The file is a text file with each line representing a record. The fields in each record are separated by the '|' character.
+As an example. consider the [data file](../data/lineitem.tbl).  The file is a text file with each line representing a object. The fields in each object are separated by the '|' character.
 
 We assume the HDFS URL to be hdfs://localhost:54310. We further assume that the example data file is copied to HDFS at a path denoted by “/asterix/Lineitem.tbl”.
 
@@ -231,7 +231,7 @@
 
 #### Using the Hive Parser ####
 
-if a user wants to create an external dataset that uses hive-parser to parse HDFS records, it is important that the datatype associated with the dataset matches the actual data in the Hive table for the correct initialization of the Hive SerDe. Here is the conversion from the supported Hive data types to AsterixDB data types:
+if a user wants to create an external dataset that uses hive-parser to parse HDFS objects, it is important that the datatype associated with the dataset matches the actual data in the Hive table for the correct initialization of the Hive SerDe. Here is the conversion from the supported Hive data types to AsterixDB data types:
 
 <table>
 <tr>
@@ -280,7 +280,7 @@
 </tr>
 <tr>
   <td>STRUCT</td>
-  <td>Nested Record</td>
+  <td>Nested Object</td>
 </tr>
 <tr>
   <td>LIST</td>
@@ -293,25 +293,25 @@
 
 *Example 1*: We can modify the create external dataset statement as follows:
 
-		create external dataset Lineitem('LineitemType)
-		using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/Lineitem.tbl"),("input-format"="text- input-format"),("format"="delimited-text"),("delimiter"="|"));
+        create external dataset Lineitem('LineitemType)
+        using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/Lineitem.tbl"),("input-format"="text- input-format"),("format"="delimited-text"),("delimiter"="|"));
 
-*Example 2*: Here, we create an external dataset of lineitem records stored in sequence files that has content in ADM format:
+*Example 2*: Here, we create an external dataset of lineitem objects stored in sequence files that has content in ADM format:
 
-		create external dataset Lineitem('LineitemType) 
-		using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/SequenceLineitem.tbl"),("input- format"="sequence-input-format"),("format"="adm"));
+        create external dataset Lineitem('LineitemType)
+        using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/SequenceLineitem.tbl"),("input- format"="sequence-input-format"),("format"="adm"));
 
-*Example 3*: Here, we create an external dataset of lineitem records stored in record-columnar files that has content in binary format parsed using hive-parser with hive ColumnarSerde:
+*Example 3*: Here, we create an external dataset of lineitem objects stored in object-columnar files that has content in binary format parsed using hive-parser with hive ColumnarSerde:
 
-		create external dataset Lineitem('LineitemType)
-		using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/RCLineitem.tbl"),("input-format"="rc-input-format"),("format"="binary"),("parser"="hive-parser"),("hive- serde"="org.apache.hadoop.hive.serde2.columnar.ColumnarSerde"));
+        create external dataset Lineitem('LineitemType)
+        using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/RCLineitem.tbl"),("input-format"="rc-input-format"),("format"="binary"),("parser"="hive-parser"),("hive- serde"="org.apache.hadoop.hive.serde2.columnar.ColumnarSerde"));
 
 ## <a id="WritingQueriesAgainstAnExternalDataset">Writing Queries against an External Dataset</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
 You may write AQL queries against an external dataset in exactly the same way that queries are written against internal datasets. The following is an example of an AQL query that applies a filter and returns an ordered result.
 
 
         use dataverse ExternalFileDemo;
-        
+
         for $c in dataset('Lineitem')
         where $c.l_orderkey <= 3
         order by $c.l_orderkey, $c.l_linenumber
@@ -321,25 +321,25 @@
 AsterixDB supports building B-Tree and R-Tree indexes over static data stored in the Hadoop Distributed File System.
 To create an index, first create an external dataset over the data as follows
 
-		create external dataset Lineitem(LineitemType) 
-		using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/Lineitem.tbl"),("input-format"="text-input- format"),("format"="delimited-text"),("delimiter"="|"));
+        create external dataset Lineitem(LineitemType)
+        using hdfs(("hdfs"="hdfs://localhost:54310"),("path"="/asterix/Lineitem.tbl"),("input-format"="text-input- format"),("format"="delimited-text"),("delimiter"="|"));
 
 You can then create a B-Tree index on this dataset instance as if the dataset was internally stored as follows:
 
-		create index PartkeyIdx on Lineitem(l_partkey);
+        create index PartkeyIdx on Lineitem(l_partkey);
 
 You could also create an R-Tree index as follows:
 
-		￼create index IndexName on DatasetName(attribute-name) type rtree;
+        ￼create index IndexName on DatasetName(attribute-name) type rtree;
 
 After building the indexes, the AsterixDB query compiler can use them to access the dataset and answer queries in a more cost effective manner.
 AsterixDB can read all HDFS input formats, but indexes over external datasets can currently be built only for HDFS datasets with 'text-input-format', 'sequence-input-format' or 'rc-input-format'.
 
 ## <a id="ExternalDataSnapshots">External Data Snapshots</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
-An external data snapshot represents the status of a dataset's files in HDFS at a point in time. Upon creating the first index over an external dataset, AsterixDB captures and stores a snapshot of the dataset in HDFS. Only records present at the snapshot capture time are indexed, and any additional indexes created afterwards will only contain data that was present at the snapshot capture time thus preserving consistency across all indexes of a dataset.
+An external data snapshot represents the status of a dataset's files in HDFS at a point in time. Upon creating the first index over an external dataset, AsterixDB captures and stores a snapshot of the dataset in HDFS. Only objects present at the snapshot capture time are indexed, and any additional indexes created afterwards will only contain data that was present at the snapshot capture time thus preserving consistency across all indexes of a dataset.
 To update all indexes of an external dataset and advance the snapshot time to be the present time, a user can use the refresh external dataset command as follows:
 
-		refresh external dataset DatasetName;
+        refresh external dataset DatasetName;
 
 After a refresh operation commits, all of the dataset's indexes will reflect the status of the data as of the new snapshot capture time.
 
@@ -357,7 +357,7 @@
 
 A. No, queries' results are access path independent and the stored snapshot is used to determines which data are going to be included when processing queries.
 
-Q. I created an index over an external dataset and then deleted some of my dataset's files in HDFS, Will indexed data access still return the records in deleted files?
+Q. I created an index over an external dataset and then deleted some of my dataset's files in HDFS, Will indexed data access still return the objects in deleted files?
 
 A. No. When AsterixDB accesses external data, with or without the use of indexes, it only access files present in the file system at runtime.
 
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/filters.md b/asterixdb/asterix-doc/src/site/markdown/aql/filters.md
index 9a1fc4c..24461f3 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/filters.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/filters.md
@@ -72,7 +72,7 @@
 be to scan the whole `TweetMessages` dataset and then apply the
 predicate as a post-processing step. However, if disk components of
 the primary index were tagged with the minimum and maximum timestamp
-values of the records they contain, we could utilize the tagged
+values of the objects they contain, we could utilize the tagged
 information to directly access the primary index and prune components
 that do not match the query predicate. Thus, we could save substantial
 cost by avoiding scanning the whole dataset and only access the
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/manual.md b/asterixdb/asterix-doc/src/site/markdown/aql/manual.md
index 393beec..ecdc715 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/manual.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/manual.md
@@ -66,7 +66,7 @@
                   | FunctionCallExpr
                   | DatasetAccessExpression
                   | ListConstructor
-                  | RecordConstructor
+                  | ObjectConstructor
 
 The most basic building block for any AQL expression is the PrimaryExpr.
 This can be a simple literal (constant) value,
@@ -75,7 +75,7 @@
 a function call,
 an expression accessing the ADM contents of a dataset,
 a newly constructed list of ADM instances,
-or a newly constructed ADM record.
+or a newly constructed ADM object.
 
 #### Literals
 
@@ -168,7 +168,7 @@
     <SPECIALCHARS>          ::= ["$", "_", "-"]
 
 Querying Big Data is the main point of AsterixDB and AQL.
-Data in AsterixDB reside in datasets (collections of ADM records),
+Data in AsterixDB reside in datasets (collections of ADM objects),
 each of which in turn resides in some namespace known as a dataverse (data universe).
 Data access in a query expression is accomplished via a DatasetAccessExpression.
 Dataset access expressions are most commonly used in FLWOR expressions, where variables
@@ -193,21 +193,21 @@
     ListConstructor          ::= ( OrderedListConstructor | UnorderedListConstructor )
     OrderedListConstructor   ::= "[" ( Expression ( "," Expression )* )? "]"
     UnorderedListConstructor ::= "{{" ( Expression ( "," Expression )* )? "}}"
-    RecordConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? "}"
+    ObjectConstructor        ::= "{" ( FieldBinding ( "," FieldBinding )* )? "}"
     FieldBinding             ::= Expression ":" Expression
 
 A major feature of AQL is its ability to construct new ADM data instances.
 This is accomplished using its constructors for each of the major ADM complex object structures,
-namely lists (ordered or unordered) and records.
+namely lists (ordered or unordered) and objects.
 Ordered lists are like JSON arrays, while unordered lists have bag (multiset) semantics.
-Records are built from attributes that are field-name/field-value pairs, again like JSON.
+Objects are built from attributes that are field-name/field-value pairs, again like JSON.
 (See the AsterixDB Data Model document for more details on each.)
 
 The following examples illustrate how to construct a new ordered list with 3 items,
-a new unordered list with 4 items, and a new record with 2 fields, respectively.
+a new unordered list with 4 items, and a new object with 2 fields, respectively.
 List elements can be homogeneous (as in the first example), which is the common case,
 or they may be heterogeneous (as in the second example).
-The data values and field name values used to construct lists and records in constructors are all simply AQL expressions.
+The data values and field name values used to construct lists and objects in constructors are all simply AQL expressions.
 Thus the list elements, field names, and field values used in constructors can be simple literals (as in these three examples)
 or they can come from query variable references or even arbitrarily complex AQL expressions.
 
@@ -224,7 +224,7 @@
 
 ##### Note
 
-When constructing nested records there needs to be a space between the closing braces to avoid confusion with the `}}` token that ends an unordered list constructor:
+When constructing nested objects there needs to be a space between the closing braces to avoid confusion with the `}}` token that ends an unordered list constructor:
 `{ "a" : { "b" : "c" }}` will fail to parse while `{ "a" : { "b" : "c" } }` will work.
 
 ### Path Expressions
@@ -234,13 +234,13 @@
     Index     ::= "[" ( Expression | "?" ) "]"
 
 Components of complex types in ADM are accessed via path expressions.
-Path access can be applied to the result of an AQL expression that yields an instance of such a type, e.g., a record or list instance.
-For records, path access is based on field names.
+Path access can be applied to the result of an AQL expression that yields an instance of such a type, e.g., a object or list instance.
+For objects, path access is based on field names.
 For ordered lists, path access is based on (zero-based) array-style indexing.
 AQL also supports an "I'm feeling lucky" style index accessor, [?], for selecting an arbitrary element from an ordered list.
 Attempts to access non-existent fields or list elements produce a null (i.e., missing information) result as opposed to signaling a runtime error.
 
-The following examples illustrate field access for a record, index-based element access for an ordered list, and also a composition thereof.
+The following examples illustrate field access for a object, index-based element access for an ordered list, and also a composition thereof.
 
 ##### Examples
 
@@ -341,7 +341,7 @@
 
 The next example shows a FLWOR expression that joins two datasets, FacebookUsers and FacebookMessages,
 returning user/message pairs.
-The results contain one record per pair, with result records containing the user's name and an entire message.
+The results contain one object per pair, with result objects containing the user's name and an entire message.
 
 ##### Example
 
@@ -355,7 +355,7 @@
       };
 
 In the next example, a `let` clause is used to bind a variable to all of a user's FacebookMessages.
-The query returns one record per user, with result records containing the user's name and the set of all messages by that user.
+The query returns one object per user, with result objects containing the user's name and the set of all messages by that user.
 
 ##### Example
 
@@ -485,7 +485,7 @@
 
 In addition to expresssions for queries, AQL supports a variety of statements for data
 definition and manipulation purposes as well as controlling the context to be used in
-evaluating AQL expressions. AQL supports record-level ACID transactions that begin and terminate implicitly for each record inserted, deleted, upserted, or searched while a given AQL statement is being executed.
+evaluating AQL expressions. AQL supports object-level ACID transactions that begin and terminate implicitly for each object inserted, deleted, upserted, or searched while a given AQL statement is being executed.
 
 This section details the statements supported in the AQL language.
 
@@ -564,9 +564,9 @@
     TypeSpecification    ::= "type" FunctionOrTypeName IfNotExists "as" TypeExpr
     FunctionOrTypeName   ::= QualifiedName
     IfNotExists          ::= ( "if not exists" )?
-    TypeExpr             ::= RecordTypeDef | TypeReference | OrderedListTypeDef | UnorderedListTypeDef
-    RecordTypeDef        ::= ( "closed" | "open" )? "{" ( RecordField ( "," RecordField )* )? "}"
-    RecordField          ::= Identifier ":" ( TypeExpr ) ( "?" )?
+    TypeExpr             ::= ObjectTypeDef | TypeReference | OrderedListTypeDef | UnorderedListTypeDef
+    ObjectTypeDef        ::= ( "closed" | "open" )? "{" ( ObjectField ( "," ObjectField )* )? "}"
+    ObjectField          ::= Identifier ":" ( TypeExpr ) ( "?" )?
     NestedField          ::= Identifier ( "." Identifier )*
     IndexField           ::= NestedField ( ":" TypeReference )?
     TypeReference        ::= Identifier
@@ -576,16 +576,16 @@
 The create type statement is used to create a new named ADM datatype.
 This type can then be used to create datasets or utilized when defining one or more other ADM datatypes.
 Much more information about the Asterix Data Model (ADM) is available in the [data model reference guide](datamodel.html) to ADM.
-A new type can be a record type, a renaming of another type, an ordered list type, or an unordered list type.
-A record type can be defined as being either open or closed.
-Instances of a closed record type are not permitted to contain fields other than those specified in the create type statement.
-Instances of an open record type may carry additional fields, and open is the default for a new type (if neither option is specified).
+A new type can be a object type, a renaming of another type, an ordered list type, or an unordered list type.
+A object type can be defined as being either open or closed.
+Instances of a closed object type are not permitted to contain fields other than those specified in the create type statement.
+Instances of an open object type may carry additional fields, and open is the default for a new type (if neither option is specified).
 
-The following example creates a new ADM record type called FacebookUser type.
+The following example creates a new ADM object type called FacebookUser type.
 Since it is closed, its instances will contain only what is specified in the type definition.
 The first four fields are traditional typed name/value pairs.
 The friend-ids field is an unordered list of 32-bit integers.
-The employment field is an ordered list of instances of another named record type, EmploymentType.
+The employment field is an ordered list of instances of another named object type, EmploymentType.
 
 ##### Example
 
@@ -598,7 +598,7 @@
       "employment" : [ EmploymentType ]
     }
 
-The next example creates a new ADM record type called FbUserType. Note that the type of the id field is UUID. You need to use this field type if you want to have this field be an autogenerated-PK field. Refer to the Datasets section later for more details.
+The next example creates a new ADM object type called FbUserType. Note that the type of the id field is UUID. You need to use this field type if you want to have this field be an autogenerated-PK field. Refer to the Datasets section later for more details.
 
 ##### Example
 
@@ -628,12 +628,12 @@
     PrimaryKey           ::= "primary" "key" Identifier ( "," Identifier )* ( "autogenerated ")?
 
 The create dataset statement is used to create a new dataset.
-Datasets are named, unordered collections of ADM record instances; they
+Datasets are named, unordered collections of ADM object instances; they
 are where data lives persistently and are the targets for queries in AsterixDB.
 Datasets are typed, and AsterixDB will ensure that their contents conform to their type definitions.
 An Internal dataset (the default) is a dataset that is stored in and managed by AsterixDB.
 It must have a specified unique primary key that can be used to partition data across nodes of an AsterixDB cluster.
-The primary key is also used in secondary indexes to uniquely identify the indexed primary data records. Random primary key (UUID) values can be auto-generated by declaring the field to be UUID and putting "autogenerated" after the "primary key" identifier. In this case, values for the auto-generated PK field should not be provided by the user since it will be auto-generated by AsterixDB.
+The primary key is also used in secondary indexes to uniquely identify the indexed primary data objects. Random primary key (UUID) values can be auto-generated by declaring the field to be UUID and putting "autogenerated" after the "primary key" identifier. In this case, values for the auto-generated PK field should not be provided by the user since it will be auto-generated by AsterixDB.
 Optionally, a filter can be created on a field to further optimize range queries with predicates on the filter's field.
 (Refer to [Filter-Based LSM Index Acceleration](filters.html) for more information about filters.)
 
@@ -667,19 +667,19 @@
 AsterixDB is the prefix policy except when there is a filter on a dataset, where the preferred policy for filters is the correlated-prefix.
 
 
-The following example creates an internal dataset for storing FacefookUserType records.
+The following example creates an internal dataset for storing FacefookUserType objects.
 It specifies that their id field is their primary key.
 
 ##### Example
     create internal dataset FacebookUsers(FacebookUserType) primary key id;
 
-The following example creates an internal dataset for storing FbUserType records.
-It specifies that their id field is their primary key. It also specifies that the id field is an auto-generated field, meaning that a randomly generated UUID value will be assigned to each record by the system. (A user should therefore not proivde a value for this field.) Note that the id field should be UUID.
+The following example creates an internal dataset for storing FbUserType objects.
+It specifies that their id field is their primary key. It also specifies that the id field is an auto-generated field, meaning that a randomly generated UUID value will be assigned to each object by the system. (A user should therefore not proivde a value for this field.) Note that the id field should be UUID.
 
 ##### Example
     create internal dataset FbMsgs(FbUserType) primary key id autogenerated;
 
-The next example creates an external dataset for storing LineitemType records.
+The next example creates an external dataset for storing LineitemType objects.
 The choice of the `hdfs` adapter means that its data will reside in HDFS.
 The create statement provides parameters used by the hdfs adapter:
 the URL and path needed to locate the data in HDFS and a description of the data format.
@@ -708,7 +708,7 @@
 An index field is not required to be part of the datatype associated with a dataset if that datatype is declared as
 open and the field's type is provided along with its type and the `enforced` keyword is specified in the end of index definition.
 `Enforcing` an open field will introduce a check that will make sure that the actual type of an indexed
-field (if the field exists in the record) always matches this specified (open) field type.
+field (if the field exists in the object) always matches this specified (open) field type.
 
 The following example creates a btree index called fbAuthorIdx on the author-id field of the FacebookMessages dataset.
 This index can be useful for accelerating exact-match queries, range search queries, and joins involving the author-id field.
@@ -834,12 +834,11 @@
 If the query part of an insert returns a single object, then the insert statement itself will
 be a single, atomic transaction.
 If the query part returns multiple objects, then each object inserted will be handled independently
-as a tranaction. If a dataset has an auto-generated primary key field, an insert statement should not include a value for that field in it. (The system will automatically extend the provided record with this additional field and a corresponding value.).
-The optional "as Variable" provides a variable binding for the inserted records, which can be used in the "returning" clause.
-The optional "returning Query" allows users to run simple queries/functions on the records returned by the insert.
+as a tranaction. If a dataset has an auto-generated primary key field, an insert statement should not include a value for that field in it. (The system will automatically extend the provided object with this additional field and a corresponding value.).
+The optional "as Variable" provides a variable binding for the inserted objects, which can be used in the "returning" clause.
+The optional "returning Query" allows users to run simple queries/functions on the objects returned by the insert.
 This query cannot refer to any datasets.
 
-
 The following example illustrates a query-based insertion.
 
 ##### Example
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/primer.md b/asterixdb/asterix-doc/src/site/markdown/aql/primer.md
index e07edb6..d245158 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/primer.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/primer.md
@@ -132,12 +132,12 @@
 The first three lines above tell AsterixDB to drop the old TinySocial dataverse, if one already
 exists, and then to create a brand new one and make it the focus of the statements that follow.
 The first _create type_ statement creates a datatype for holding information about Chirp users.
-It is a record type with a mix of integer and string data, very much like a (flat) relational tuple.
+It is a object type with a mix of integer and string data, very much like a (flat) relational tuple.
 The indicated fields are all mandatory, but because the type is open, additional fields are welcome.
 The second statement creates a datatype for Chirp messages; this shows how to specify a closed type.
 Interestingly (based on one of Chirp's APIs), each Chirp message actually embeds an instance of the
 sending user's information (current as of when the message was sent), so this is an example of a nested
-record in ADM.
+object in ADM.
 Chirp messages can optionally contain the sender's location, which is modeled via the senderLocation
 field of spatial type _point_; the question mark following the field type indicates its optionality.
 An optional field is like a nullable field in SQL---it may be present or missing, but when it's present,
@@ -147,11 +147,11 @@
 this field holds a bag (*a.k.a.* an unordered list) of strings.
 Since the overall datatype definition for Chirp messages says "closed", the fields that it lists are
 the only fields that instances of this type will be allowed to contain.
-The next two _create type_ statements create a record type for holding information about one component of
-the employment history of a Gleambook user and then a record type for holding the user information itself.
+The next two _create type_ statements create a object type for holding information about one component of
+the employment history of a Gleambook user and then a object type for holding the user information itself.
 The Gleambook user type highlights a few additional ADM data model features.
 Its friendIds field is a bag of integers, presumably the Gleambook user ids for this user's friends,
-and its employment field is an ordered list of employment records.
+and its employment field is an ordered list of employment objects.
 The final _create type_ statement defines a type for handling the content of a Gleambook message in our
 hypothetical social data storage scenario.
 
@@ -243,7 +243,7 @@
 ## Loading Data Into AsterixDB ##
 Okay, so far so good---AsterixDB is now ready for data, so let's give it some data to store.
 Our next task will be to load some sample data into the four datasets that we just defined.
-Here we will load a tiny set of records, defined in ADM format (a superset of JSON), into each dataset.
+Here we will load a tiny set of objects, defined in ADM format (a superset of JSON), into each dataset.
 In the boxes below you can see the actual data instances contained in each of the provided sample files.
 In order to load this data yourself, you should first store the four corresponding `.adm` files
 (whose URLs are indicated on top of each box below) into a filesystem directory accessible to your
@@ -307,7 +307,7 @@
         {"messageId":14,"authorId":9,"inResponseTo":12,"senderLocation":point("41.33,85.28"),"message":" love at&t its 3G is good:)"}
         {"messageId":15,"authorId":7,"inResponseTo":11,"senderLocation":point("44.47,67.11"),"message":" like iphone the voicemail-service is awesome"}
 
-It's loading time! We can use AQL _LOAD_ statements to populate our datasets with the sample records shown above.
+It's loading time! We can use AQL _LOAD_ statements to populate our datasets with the sample objects shown above.
 The following shows how loading can be done for data stored in `.adm` files in your local filesystem.
 *Note:* You _MUST_ replace the `<Host Name>` and `<Absolute File Path>` placeholders in each load
 statement below with valid values based on the host IP address (or host name) for the machine and
@@ -466,7 +466,7 @@
         };
 
 The result of this query is a sequence of new ADM instances, one for each author/message pair.
-Each instance in the result will be an ADM record containing two fields, "uname" and "message",
+Each instance in the result will be an ADM object containing two fields, "uname" and "message",
 containing the user's name and the message text, respectively, for each author/message pair.
 (Note that "uname" and "message" are both simple AQL expressions themselves---so in the most
 general case, even the resulting field names can be computed as part of the query, making AQL
@@ -561,7 +561,7 @@
 
 The AQL language supports nesting, both of queries and of query results, and the combination allows for
 an arguably cleaner/more natural approach to such queries.
-As an example, supposed we wanted, for each Gleambook user, to produce a record that has his/her name
+As an example, supposed we wanted, for each Gleambook user, to produce a object that has his/her name
 plus a list of the messages written by that user.
 In SQL, this would involve a left outer join between users and messages, grouping by user, and having
 the user name repeated along side each message.
@@ -578,7 +578,7 @@
         };
 
 This AQL query binds the variable `$user` to the data instances in GleambookUsers;
-for each user, it constructs a result record containing a "uname" field with the user's
+for each user, it constructs a result object containing a "uname" field with the user's
 name and a "messages" field with a nested collection of all messages for that user.
 The nested collection for each user is specified by using a correlated subquery.
 (Note: While it looks like nested loops could be involved in computing the result,
@@ -678,7 +678,7 @@
 The expressive power of AQL includes support for queries involving "some" (existentially quantified)
 and "all" (universally quantified) query semantics.
 As an example of an existential AQL query, here we show a query to list the Gleambook users who are currently employed.
-Such employees will have an employment history containing a record with the endDate value missing, which leads us to the
+Such employees will have an employment history containing a object with the endDate value missing, which leads us to the
 following AQL query:
 
         use dataverse TinySocial;
@@ -699,7 +699,7 @@
 
 ### Query 7 - Universal Quantification ###
 As an example of a universal AQL query, here we show a query to list the Gleambook users who are currently unemployed.
-Such employees will have an employment history containing no records that miss endDate values, leading us to the
+Such employees will have an employment history containing no objects that miss endDate values, leading us to the
 following AQL query:
 
         use dataverse TinySocial;
@@ -747,11 +747,11 @@
 with each such group having an associated $uid variable value (i.e., the chirping user's screen name).
 In the context of the return clause, due to "... with $cm ...", $uid is bound to the chirper's id and $cm
 is bound to the _set_ of chirps issued by that chirper.
-The return clause constructs a result record containing the chirper's user id and the count of the items
+The return clause constructs a result object containing the chirper's user id and the count of the items
 in the associated chirp set.
-The query result will contain one such record per screen name.
+The query result will contain one such object per screen name.
 This query also illustrates another feature of AQL; notice that each user's screen name is accessed via a
-path syntax that traverses each chirp's nested record structure.
+path syntax that traverses each chirp's nested object structure.
 
 Here is the expected result for this query over the sample data:
 
@@ -832,7 +832,7 @@
 
 This query illustrates several things worth knowing in order to write fuzzy queries in AQL.
 First, as mentioned earlier, AQL offers an operator-based syntax for seeing whether two values are "similar" to one another or not.
-Second, recall that the referredTopics field of records of datatype ChirpMessageType is a bag of strings.
+Second, recall that the referredTopics field of objects of datatype ChirpMessageType is a bag of strings.
 This query sets the context for its similarity join by requesting that Jaccard-based similarity semantics
 ([http://en.wikipedia.org/wiki/Jaccard_index](http://en.wikipedia.org/wiki/Jaccard_index))
 be used for the query's similarity operator and that a similarity index of 0.3 be used as its similarity threshold.
@@ -881,7 +881,7 @@
 
 In general, the data to be inserted may be specified using any valid AQL query expression.
 The insertion of a single object instance, as in this example, is just a special case where
-the query expression happens to be a record constructor involving only constants.
+the query expression happens to be a object constructor involving only constants.
 
 ### Deleting Existing Data  ###
 In addition to inserting new data, AsterixDB supports deletion from datasets via the AQL _delete_ statement.
@@ -896,13 +896,13 @@
 
 It should be noted that one form of data change not yet supported by AsterixDB is in-place data modification (_update_).
 Currently, only insert and delete operations are supported; update is not.
-To achieve the effect of an update, two statements are currently needed---one to delete the old record from the
-dataset where it resides, and another to insert the new replacement record (with the same primary key but with
+To achieve the effect of an update, two statements are currently needed---one to delete the old object from the
+dataset where it resides, and another to insert the new replacement object (with the same primary key but with
 different field values for some of the associated data content).
 
 ### Upserting Data  ###
 In addition to loading, querying, inserting, and deleting data, AsterixDB supports upserting
-records using the AQL _upsert_ statement.
+objects using the AQL _upsert_ statement.
 
 The following example deletes the chirp with chirpId = 20 (if one exists) and inserts the
 new chirp with chirpId = 20 by user "SwanSmitty" to the ChirpMessages dataset. The two
@@ -948,11 +948,11 @@
 Note that such an upsert operation is executed in two steps:
 The query is performed, after which the query's locks are released,
 and then its result is upserted into the dataset.
-This means that a record can be modified between computing the query result and performing the upsert.
+This means that a object can be modified between computing the query result and performing the upsert.
 
 ### Transaction Support
 
-AsterixDB supports record-level ACID transactions that begin and terminate implicitly for each record inserted, deleted, or searched while a given AQL statement is being executed. This is quite similar to the level of transaction support found in today's NoSQL stores. AsterixDB does not support multi-statement transactions, and in fact an AQL statement that involves multiple records can itself involve multiple independent record-level transactions. An example consequence of this is that, when an AQL statement attempts to insert 1000 records, it is possible that the first 800 records could end up being committed while the remaining 200 records fail to be inserted. This situation could happen, for example, if a duplicate key exception occurs as the 801st insertion is attempted. If this happens, AsterixDB will report the error (e.g., a duplicate key exception) as the result of the offending AQL insert statement, and the application logic above will need to take the appropriate action(s) needed to assess the resulting state and to clean up and/or continue as appropriate.
+AsterixDB supports object-level ACID transactions that begin and terminate implicitly for each object inserted, deleted, or searched while a given AQL statement is being executed. This is quite similar to the level of transaction support found in today's NoSQL stores. AsterixDB does not support multi-statement transactions, and in fact an AQL statement that involves multiple objects can itself involve multiple independent object-level transactions. An example consequence of this is that, when an AQL statement attempts to insert 1000 objects, it is possible that the first 800 objects could end up being committed while the remaining 200 objects fail to be inserted. This situation could happen, for example, if a duplicate key exception occurs as the 801st insertion is attempted. If this happens, AsterixDB will report the error (e.g., a duplicate key exception) as the result of the offending AQL insert statement, and the application logic above will need to take the appropriate action(s) needed to assess the resulting state and to clean up and/or continue as appropriate.
 
 ## Further Help ##
 That's it!  You are now armed and dangerous with respect to semistructured data management using AsterixDB and AQL.
diff --git a/asterixdb/asterix-doc/src/site/markdown/aql/similarity.md b/asterixdb/asterix-doc/src/site/markdown/aql/similarity.md
index 9fa3d44..88ca8a5 100644
--- a/asterixdb/asterix-doc/src/site/markdown/aql/similarity.md
+++ b/asterixdb/asterix-doc/src/site/markdown/aql/similarity.md
@@ -30,7 +30,7 @@
 ## <a id="Motivation">Motivation</a> <font size="4"><a href="#toc">[Back to TOC]</a></font> ##
 
 Similarity queries are widely used in applications where users need to
-find records that satisfy a similarity predicate, while exact matching
+find objects that satisfy a similarity predicate, while exact matching
 is not sufficient. These queries are especially important for social
 and Web applications, where errors, abbreviations, and inconsistencies
 are common.  As an example, we may want to find all the movies
@@ -214,7 +214,7 @@
 
 A "keyword index" is constructed on a set of strings or sets (e.g., OrderedList, UnorderedList). Instead of
 generating grams as in an ngram index, we generate tokens (e.g., words) and for each token, construct an inverted list that includes the ids of the
-records with this token.  The following two examples show how to create keyword index on two different types:
+objects with this token.  The following two examples show how to create keyword index on two different types:
 
 
 #### Keyword Index on String Type ####
diff --git a/asterixdb/asterix-doc/src/site/markdown/csv.md b/asterixdb/asterix-doc/src/site/markdown/csv.md
index d761aaf..1ff03d9 100644
--- a/asterixdb/asterix-doc/src/site/markdown/csv.md
+++ b/asterixdb/asterix-doc/src/site/markdown/csv.md
@@ -23,15 +23,15 @@
 
 AsterixDB supports the CSV format for both data input and query result
 output. In both cases, the structure of the CSV data must be defined
-using a named ADM record datatype. The CSV format, limitations, and
+using a named ADM object datatype. The CSV format, limitations, and
 MIME type are defined by [RFC
 4180](https://tools.ietf.org/html/rfc4180).
 
 CSV is not as expressive as the full Asterix Data Model, meaning that
 not all data which can be represented in ADM can also be represented
 as CSV. So the form of this datatype is limited. First, obviously it
-may not contain any nested records or lists, as CSV has no way to
-represent nested data structures. All fields in the record type must
+may not contain any nested objects or lists, as CSV has no way to
+represent nested data structures. All fields in the object type must
 be primitive. Second, the set of supported primitive types is limited
 to numerics (`int8`, `int16`, `int32`, `int64`, `float`, `double`) and
 `string`.  On output, a few additional primitive types (`boolean`,
@@ -101,11 +101,11 @@
 ## CSV Output
 
 Any query may be rendered as CSV when using AsterixDB's HTTP
-interface.  To do so, there are two steps required: specify the record
+interface.  To do so, there are two steps required: specify the object
 type which defines the schema of your CSV, and request that Asterix
 use the CSV output format.
 
-#### Output Record Type
+#### Output Object Type
 
 Background: The result of any AQL query is an unordered list of
 _instances_, where each _instance_ is an instance of an AQL
@@ -113,15 +113,15 @@
 the legal datatypes in this unordered list due to the limited
 expressability of CSV:
 
-1. Each instance must be of a record type.
-2. Each instance must be of the _same_ record type.
-3. The record type must conform to the content and type restrictions
+1. Each instance must be of a object type.
+2. Each instance must be of the _same_ object type.
+3. The object type must conform to the content and type restrictions
 mentioned in the introduction.
 
 While it would be possible to structure your query to cast all result
 instances to a given type, it is not necessary. AQL offers a built-in
 feature which will automatically cast all top-level instances in the
-result to a specified named ADM record type. To enable this feature,
+result to a specified named ADM object type. To enable this feature,
 use a `set` statement prior to the query to set the parameter
 `output-record-type` to the name of an ADM type. This type must have
 already been defined in the current dataverse.
@@ -142,7 +142,7 @@
 Two notes about `output-record-type`:
 
 1. This feature is not strictly related to CSV; it may be used with
-any output formats (in which case, any record datatype may be
+any output formats (in which case, any object datatype may be
 specified, not subject to the limitations specified in the
 introduction of this page).
 2. When the CSV output format is requested, `output-record-type` is in
@@ -230,16 +230,16 @@
 
 #### Issues with open datatypes and optional fields
 
-As mentioned earlier, CSV is a rigid format. It cannot express records
+As mentioned earlier, CSV is a rigid format. It cannot express objects
 with different numbers of fields, which ADM allows through both open
 datatypes and optional fields.
 
-If your output record type contains optional fields, this will not
+If your output object type contains optional fields, this will not
 result in any errors. If the output data of a query does not contain
 values for an optional field, this will be represented in CSV as
 `null`.
 
-If your output record type is open, this will also not result in any
+If your output object type is open, this will also not result in any
 errors. If the output data of a query contains any open fields, the
 corresponding rows in the resulting CSV will contain more
 comma-separated values than the others. On each such row, the data
@@ -253,6 +253,6 @@
 CSV processors. Some may throw a parsing error. If you attempt to load
 this data into AsterixDB later using `load dataset`, the extra fields
 will be silently ignored. For this reason it is recommended that you
-use only closed datatypes as output record types. AsterixDB allows to
-use an open record type only to support cases where the type already
+use only closed datatypes as output object types. AsterixDB allows to
+use an open object type only to support cases where the type already
 exists for other parts of your application.
diff --git a/asterixdb/asterix-doc/src/site/markdown/datamodel.md b/asterixdb/asterix-doc/src/site/markdown/datamodel.md
index 5a5aced..cba0d18 100644
--- a/asterixdb/asterix-doc/src/site/markdown/datamodel.md
+++ b/asterixdb/asterix-doc/src/site/markdown/datamodel.md
@@ -43,7 +43,7 @@
     * [Null](#IncompleteInformationTypesNull)
     * [Missing](#IncompleteInformationTypesMissing)
 * [Derived Types](#DerivedTypes)
-    * [Record](#DerivedTypesRecord)
+    * [Object](#DerivedTypesObject)
     * [Array](#DerivedTypesArray)
     * [Multiset](#DerivedTypesMultiset)
 
@@ -350,12 +350,12 @@
 
 
 ### <a id="IncompleteInformationTypesMissing">Missing</a> ###
-`missing` represents a missing name-value pair in a record.
+`missing` represents a missing name-value pair in a object.
 If the referenced field does not exist, an empty result value is returned by the query.
 
 As neither the data model nor the system enforces homogeneity for datasets or collections,
 items in a dataset or collection can be of heterogeneous types and
-so a field can be present in one record and `missing` in another.
+so a field can be present in one object and `missing` in another.
 
  * Example:
 
@@ -366,12 +366,12 @@
 
         {  }
 
-Since a field with value `missing` means the field is absent, we get an empty record.
+Since a field with value `missing` means the field is absent, we get an empty object.
 
 ## <a id="DerivedTypes">Derived Types</a> ##
 
-### <a id="DerivedTypesRecord">Record</a>###
-A `record` contains a set of ﬁelds, where each ﬁeld is described by its name and type. A record type is either open or closed. Open records can contain ﬁelds that are not part of the type deﬁnition, while closed records cannot. Syntactically, record constructors are surrounded by curly braces "{...}".
+### <a id="DerivedTypesObject">Object</a>###
+A `object` contains a set of ﬁelds, where each ﬁeld is described by its name and type. A object type is either open or closed. Open objects can contain ﬁelds that are not part of the type deﬁnition, while closed objects cannot. Syntactically, object constructors are surrounded by curly braces "{...}".
 
 An example would be
 
diff --git a/asterixdb/asterix-doc/src/site/markdown/feeds/tutorial.md b/asterixdb/asterix-doc/src/site/markdown/feeds/tutorial.md
index fb06a92..948c7aa 100644
--- a/asterixdb/asterix-doc/src/site/markdown/feeds/tutorial.md
+++ b/asterixdb/asterix-doc/src/site/markdown/feeds/tutorial.md
@@ -34,7 +34,7 @@
 ## <a name="FeedAdaptors">Feed Adaptors</a>  ##
 
 The functionality of establishing a connection with a data source
-and receiving, parsing and translating its data into ADM records
+and receiving, parsing and translating its data into ADM objects
 (for storage inside AsterixDB) is contained in a feed adaptor. A
 feed adaptor is an implementation of an interface and its details are
 specific to a given data source. An adaptor may optionally be given
@@ -54,7 +54,7 @@
 
 In this tutorial, we shall describe building two example data ingestion pipelines that cover the popular scenario of ingesting data from (a) Twitter and (b) RSS Feed source.
 
-####Ingesting Twitter Stream 
+####Ingesting Twitter Stream
 We shall use the built-in push-based Twitter adaptor.
 As a pre-requisite, we must define a Tweet using the AsterixDB Data Model (ADM) and the AsterixDB Query Language (AQL). Given below are the type definition in AQL that create a Tweet datatype which is representative of a real tweet as obtained from Twitter.
 
@@ -229,17 +229,17 @@
 values. An ingestion policy dictates the runtime behavior of
 the feed in response to resource bottlenecks and failures. AsterixDB provides
 a list of policy parameters that help customize the
-system's runtime behavior when handling excess records. AsterixDB
+system's runtime behavior when handling excess objects. AsterixDB
 provides a set of built-in policies, each constructed by setting
 appropriate value(s) for the policy parameter(s) from the table below.
 
-####Policy Parameters 
+####Policy Parameters
 
-- *excess.records.spill*: Set to true if records that cannot be processed by an operator for lack of resources (referred to as excess records hereafter) should be persisted to the local disk for deferred processing. (Default: false)
+- *excess.records.spill*: Set to true if objects that cannot be processed by an operator for lack of resources (referred to as excess objects hereafter) should be persisted to the local disk for deferred processing. (Default: false)
 
-- *excess.records.discard*: Set to true if excess records should be discarded. (Default: false)
+- *excess.records.discard*: Set to true if excess objects should be discarded. (Default: false)
 
-- *excess.records.throttle*: Set to true if rate of arrival of records is required to be reduced in an adaptive manner to prevent having any excess records (Default: false)
+- *excess.records.throttle*: Set to true if rate of arrival of objects is required to be reduced in an adaptive manner to prevent having any excess objects (Default: false)
 
 - *excess.records.elastic*: Set to true if the system should attempt to resolve resource bottlenecks by re-structuring and/or rescheduling the feed ingestion pipeline. (Default: false)
 
@@ -249,7 +249,7 @@
 
 Note that the end user may choose to form a custom policy.  For example,
 it is possible in AsterixDB to create a custom policy that spills excess
-records to disk and subsequently resorts to throttling if the
+objects to disk and subsequently resorts to throttling if the
 spillage crosses a configured threshold. In all cases, the desired
 ingestion policy is specified as part of the `connect feed` statement
 or else the "Basic" policy will be chosen as the default.
diff --git a/asterixdb/asterix-doc/src/site/markdown/sqlpp/primer-sqlpp.md b/asterixdb/asterix-doc/src/site/markdown/sqlpp/primer-sqlpp.md
index af63520..7dc1953 100644
--- a/asterixdb/asterix-doc/src/site/markdown/sqlpp/primer-sqlpp.md
+++ b/asterixdb/asterix-doc/src/site/markdown/sqlpp/primer-sqlpp.md
@@ -134,12 +134,12 @@
 The first three lines above tell AsterixDB to drop the old TinySocial dataverse, if one already
 exists, and then to create a brand new one and make it the focus of the statements that follow.
 The first _CREATE TYPE_ statement creates a datatype for holding information about Chirp users.
-It is a record type with a mix of integer and string data, very much like a (flat) relational tuple.
+It is a object type with a mix of integer and string data, very much like a (flat) relational tuple.
 The indicated fields are all mandatory, but because the type is open, additional fields are welcome.
 The second statement creates a datatype for Chirp messages; this shows how to specify a closed type.
 Interestingly (based on one of Chirp's APIs), each Chirp message actually embeds an instance of the
 sending user's information (current as of when the message was sent), so this is an example of a nested
-record in ADM.
+object in ADM.
 Chirp messages can optionally contain the sender's location, which is modeled via the senderLocation
 field of spatial type _point_; the question mark following the field type indicates its optionality.
 An optional field is like a nullable field in SQL---it may be present or missing, but when it's present,
@@ -149,11 +149,11 @@
 this field holds a bag (*a.k.a.* an unordered list) of strings.
 Since the overall datatype definition for Chirp messages says "closed", the fields that it lists are
 the only fields that instances of this type will be allowed to contain.
-The next two _CREATE TYPE_ statements create a record type for holding information about one component of
-the employment history of a Gleambook user and then a record type for holding the user information itself.
+The next two _CREATE TYPE_ statements create a object type for holding information about one component of
+the employment history of a Gleambook user and then a object type for holding the user information itself.
 The Gleambook user type highlights a few additional ADM data model features.
 Its friendIds field is a bag of integers, presumably the Gleambook user ids for this user's friends,
-and its employment field is an ordered list of employment records.
+and its employment field is an ordered list of employment objects.
 The final _CREATE TYPE_ statement defines a type for handling the content of a Gleambook message in our
 hypothetical social data storage scenario.
 
@@ -242,14 +242,14 @@
 Second, they show how to escape SQL++ keywords (or other special names) in object names by using backquotes.
 Last but not least, they show that SQL++ supports a _SELECT VALUE_ variation of SQL's traditional _SELECT_
 statement that returns a single value (or element) from a query instead of constructing a new
-record as the query's result like _SELECT_ does; here, the returned value is an entire record from
+object as the query's result like _SELECT_ does; here, the returned value is an entire object from
 the dataset being queried (e.g., _SELECT VALUE ds_ in the first statement returns the entire
-record from the metadata dataset containing the descriptions of all datasets.
+object from the metadata dataset containing the descriptions of all datasets.
 
 ## Loading Data Into AsterixDB ##
 Okay, so far so good---AsterixDB is now ready for data, so let's give it some data to store.
 Our next task will be to load some sample data into the four datasets that we just defined.
-Here we will load a tiny set of records, defined in ADM format (a superset of JSON), into each dataset.
+Here we will load a tiny set of objects, defined in ADM format (a superset of JSON), into each dataset.
 In the boxes below you can see the actual data instances contained in each of the provided sample files.
 In order to load this data yourself, you should first store the four corresponding `.adm` files
 (whose URLs are indicated on top of each box below) into a filesystem directory accessible to your
@@ -313,7 +313,7 @@
         {"messageId":14,"authorId":9,"inResponseTo":12,"senderLocation":point("41.33,85.28"),"message":" love at&t its 3G is good:)"}
         {"messageId":15,"authorId":7,"inResponseTo":11,"senderLocation":point("44.47,67.11"),"message":" like iphone the voicemail-service is awesome"}
 
-It's loading time! We can use SQL++ _LOAD_ statements to populate our datasets with the sample records shown above.
+It's loading time! We can use SQL++ _LOAD_ statements to populate our datasets with the sample objects shown above.
 The following shows how loading can be done for data stored in `.adm` files in your local filesystem.
 *Note:* You _MUST_ replace the `<Host Name>` and `<Absolute File Path>` placeholders in each load
 statement below with valid values based on the host IP address (or host name) for the machine and
@@ -384,7 +384,7 @@
 As in SQL, the query's _FROM_ clause  binds the variable `user` incrementally to the data instances residing in
 the dataset named GleambookUsers.
 Its _WHERE_ clause  selects only those bindings having a user id of interest, filtering out the rest.
-The _SELECT_ _VALUE_ clause returns the (entire) data value (a Gleambook user record in this case)
+The _SELECT_ _VALUE_ clause returns the (entire) data value (a Gleambook user object in this case)
 for each binding that satisfies the predicate.
 Since this dataset is indexed on user id (its primary key), this query will be done via a quick index lookup.
 
@@ -442,10 +442,10 @@
         WHERE msg.authorId = user.id;
 
 The result of this query is a sequence of new ADM instances, one for each author/message pair.
-Each instance in the result will be an ADM record containing two fields, "uname" and "message",
+Each instance in the result will be an ADM object containing two fields, "uname" and "message",
 containing the user's name and the message text, respectively, for each author/message pair.
 Notice how the use of a traditional SQL-style _SELECT_ clause, as opposed to the new SQL++ _SELECT VALUE_
-clause, automatically results in the construction of a new record value for each result.
+clause, automatically results in the construction of a new object value for each result.
 
 The expected result of this example SQL++ join query for our sample data set is:
 
@@ -473,9 +473,9 @@
         FROM GleambookUsers user, GleambookMessages msg
         WHERE msg.authorId = user.id;
 
-In SQL++, this _SELECT *_ query will produce a new nested record for each user/message pair.
-Each result record contains one field (named after the "user" variable) to hold the user record
-and another field (named after the "msg" variable) to hold the matching message record.
+In SQL++, this _SELECT *_ query will produce a new nested object for each user/message pair.
+Each result object contains one field (named after the "user" variable) to hold the user object
+and another field (named after the "msg" variable) to hold the matching message object.
 Note that the nested nature of this SQL++ _SELECT *_ result is different than traditional SQL,
 as SQL was not designed to handle the richer, nested data model that underlies the design of SQL++.
 
@@ -505,7 +505,7 @@
         FROM GleambookUsers user, GleambookMessages msg
         WHERE msg.authorId = user.id;
 
-This version of the query uses an explicit record constructor to build each result record.
+This version of the query uses an explicit object constructor to build each result object.
 (Note that "uname" and "message" are both simple SQL++ expressions themselves---so in the most general case,
 even the resulting field names can be computed as part of the query,
 making SQL++ a very powerful tool for slicing and dicing semistructured data.)
@@ -532,7 +532,7 @@
         WHERE msg.authorId /*+ indexnl */ = user.id;
 
 In addition to illustrating the use of a hint, the query also shows how to achieve the same
-result record format using _SELECT_ and _AS_ instead of using an explicit record constructor.
+result object format using _SELECT_ and _AS_ instead of using an explicit object constructor.
 The expected result is (of course) the same as before, modulo the order of the instances.
 Result ordering is (intentionally) undefined in SQL++ in the absence of an _ORDER BY_ clause.
 The query result for our sample data in this case is:
@@ -567,7 +567,7 @@
 
 The SQL++ language supports nesting, both of queries and of query results, and the combination allows for
 an arguably cleaner/more natural approach to such queries.
-As an example, supposed we wanted, for each Gleambook user, to produce a record that has his/her name
+As an example, supposed we wanted, for each Gleambook user, to produce a object that has his/her name
 plus a list of the messages written by that user.
 In SQL, this would involve a left outer join between users and messages, grouping by user, and having
 the user name repeated along side each message.
@@ -582,7 +582,7 @@
         FROM GleambookUsers user;
 
 This SQL++ query binds the variable `user` to the data instances in GleambookUsers;
-for each user, it constructs a result record containing a "uname" field with the user's
+for each user, it constructs a result object containing a "uname" field with the user's
 name and a "messages" field with a nested collection of all messages for that user.
 The nested collection for each user is specified by using a correlated subquery.
 (Note: While it looks like nested loops could be involved in computing the result,
@@ -673,7 +673,7 @@
 The expressive power of SQL++ includes support for queries involving "some" (existentially quantified)
 and "all" (universally quantified) query semantics.
 As an example of an existential SQL++ query, here we show a query to list the Gleambook users who are currently employed.
-Such employees will have an employment history containing a record in which the end-date field is _MISSING_
+Such employees will have an employment history containing a object in which the end-date field is _MISSING_
 (or it could be there but have the value _NULL_, as JSON unfortunately provides two ways to represent unknown values).
 This leads us to the following SQL++ query:
 
@@ -695,7 +695,7 @@
 
 ### Query 7 - Universal Quantification ###
 As an example of a universal SQL++ query, here we show a query to list the Gleambook users who are currently unemployed.
-Such employees will have an employment history containing no records with unknown end-date field values, leading us to the
+Such employees will have an employment history containing no objects with unknown end-date field values, leading us to the
 following SQL++ query:
 
         USE TinySocial;
@@ -759,11 +759,11 @@
 with each such group having an associated _uid_ variable value (i.e., the chirping user's screen name).
 In the context of the _SELECT_ clause, _uid_ is bound to the chirper's id and _cm_
 is now re-bound (due to grouping) to the _set_ of chirps issued by that chirper.
-The _SELECT_ clause yields a result record containing the chirper's user id and the count of the items
+The _SELECT_ clause yields a result object containing the chirper's user id and the count of the items
 in the associated chirp set.
-The query result will contain one such record per screen name.
+The query result will contain one such object per screen name.
 This query also illustrates another feature of SQL++; notice how each user's screen name is accessed via a
-path syntax that traverses each chirp's nested record structure.
+path syntax that traverses each chirp's nested object structure.
 
 Here is the expected result for this query over the sample data:
 
@@ -835,7 +835,7 @@
 This query illustrates several things worth knowing in order to write fuzzy queries in SQL++.
 First, as mentioned earlier, SQL++ offers an operator-based syntax (as well as a functional approach, not shown)
 for seeing whether two values are "similar" to one another or not.
-Second, recall that the referredTopics field of records of datatype ChirpMessageType is a bag of strings.
+Second, recall that the referredTopics field of objects of datatype ChirpMessageType is a bag of strings.
 This query sets the context for its similarity join by requesting that Jaccard-based similarity semantics
 ([http://en.wikipedia.org/wiki/Jaccard_index](http://en.wikipedia.org/wiki/Jaccard_index))
 be used for the query's similarity operator and that a similarity index of 0.3 be used as its similarity threshold.
@@ -884,7 +884,7 @@
 
 In general, the data to be inserted may be specified using any valid SQL++ query expression.
 The insertion of a single object instance, as in this example, is just a special case where
-the query expression happens to be a record constructor involving only constants.
+the query expression happens to be a object constructor involving only constants.
 
 ### Deleting Existing Data  ###
 In addition to inserting new data, AsterixDB supports deletion from datasets via the SQL++ _DELETE_ statement.
@@ -898,16 +898,16 @@
 
 It should be noted that one form of data change not yet supported by AsterixDB is in-place data modification (_update_).
 Currently, only insert and delete operations are supported in SQL++; updates are not.
-To achieve the effect of an update, two SQL++ statements are currently needed---one to delete the old record from the
-dataset where it resides, and another to insert the new replacement record (with the same primary key but with
+To achieve the effect of an update, two SQL++ statements are currently needed---one to delete the old object from the
+dataset where it resides, and another to insert the new replacement object (with the same primary key but with
 different field values for some of the associated data content).
-AQL additionally supports an upsert operation to either insert a record, if no record with its primary key is currently
-present in the dataset, or to replace the existing record if one already exists with the primary key value being upserted.
+AQL additionally supports an upsert operation to either insert a object, if no object with its primary key is currently
+present in the dataset, or to replace the existing object if one already exists with the primary key value being upserted.
 SQL++ will soon have _UPSERT_ as well.
 
 ### Transaction Support
 
-AsterixDB supports record-level ACID transactions that begin and terminate implicitly for each record inserted, deleted, or searched while a given SQL++ statement is being executed. This is quite similar to the level of transaction support found in today's NoSQL stores. AsterixDB does not support multi-statement transactions, and in fact an SQL++ statement that involves multiple records can itself involve multiple independent record-level transactions. An example consequence of this is that, when an SQL++ statement attempts to insert 1000 records, it is possible that the first 800 records could end up being committed while the remaining 200 records fail to be inserted. This situation could happen, for example, if a duplicate key exception occurs as the 801st insertion is attempted. If this happens, AsterixDB will report the error (e.g., a duplicate key exception) as the result of the offending SQL++ _INSERT_ statement, and the application logic above will need to take the appropriate action(s) needed to assess the resulting state and to clean up and/or continue as appropriate.
+AsterixDB supports object-level ACID transactions that begin and terminate implicitly for each object inserted, deleted, or searched while a given SQL++ statement is being executed. This is quite similar to the level of transaction support found in today's NoSQL stores. AsterixDB does not support multi-statement transactions, and in fact an SQL++ statement that involves multiple objects can itself involve multiple independent object-level transactions. An example consequence of this is that, when an SQL++ statement attempts to insert 1000 objects, it is possible that the first 800 objects could end up being committed while the remaining 200 objects fail to be inserted. This situation could happen, for example, if a duplicate key exception occurs as the 801st insertion is attempted. If this happens, AsterixDB will report the error (e.g., a duplicate key exception) as the result of the offending SQL++ _INSERT_ statement, and the application logic above will need to take the appropriate action(s) needed to assess the resulting state and to clean up and/or continue as appropriate.
 
 ## Further Help ##
 That's it! You are now armed and dangerous with respect to semistructured data management using AsterixDB via SQL++.
diff --git a/asterixdb/asterix-doc/src/site/markdown/udf.md b/asterixdb/asterix-doc/src/site/markdown/udf.md
index 0e1db87..b2ef2bc 100644
--- a/asterixdb/asterix-doc/src/site/markdown/udf.md
+++ b/asterixdb/asterix-doc/src/site/markdown/udf.md
@@ -78,12 +78,12 @@
 In the following we assume that you already created the `TwitterFeed` and its corresponding data types and dataset following the instruction explained in the [feeds tutorial](feeds/tutorial.html).
 
 A feed definition may optionally include the specification of a
-user-defined function that is to be applied to each feed record prior
+user-defined function that is to be applied to each feed object prior
 to persistence. Examples of pre-processing might include adding
-attributes, filtering out records, sampling, sentiment analysis, feature
+attributes, filtering out objects, sampling, sentiment analysis, feature
 extraction, etc. We can express a UDF, which can be defined in AQL or in a programming
 language such as Java, to perform such pre-processing. An AQL UDF is a good fit when
-pre-processing a record requires the result of a query (join or aggregate)
+pre-processing a object requires the result of a query (join or aggregate)
 over data contained in AsterixDB datasets. More sophisticated
 processing such as sentiment analysis of text is better handled
 by providing a Java UDF. A Java UDF has an initialization phase
@@ -145,9 +145,9 @@
 introduce the notion of primary and secondary feeds in AsterixDB.
 
 A feed in AsterixDB is considered to be a primary feed if it gets
-its data from an external data source. The records contained in a
+its data from an external data source. The objects contained in a
 feed (subsequent to any pre-processing) are directed to a designated
-AsterixDB dataset. Alternatively or additionally, these records can
+AsterixDB dataset. Alternatively or additionally, these objects can
 be used to derive other feeds known as secondary feeds. A secondary
 feed is similar to its parent feed in every other aspect; it can
 have an associated UDF to allow for any subsequent processing,
@@ -167,7 +167,7 @@
 
         connect feed ProcessedTwitterFeed to dataset ProcessedTweets;
 
-The `addHashTags` function is already provided in the example UDF.To see what records
+The `addHashTags` function is already provided in the example UDF.To see what objects
 are being inserted into the dataset, we can perform a simple dataset scan after
 allowing a few moments for the feed to start ingesting data:
 
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
index ea373cb..f8b20500 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/CommonFunctionMapUtil.java
@@ -63,8 +63,16 @@
         FUNCTION_NAME_MAP.put("isobject", "is-object"); // isobject, internal: is-object
         FUNCTION_NAME_MAP.put("isobj", "is-object"); // isobj, internal: is-object
 
-        // Record functions.
-        FUNCTION_NAME_MAP.put("object_pairs", "record-pairs"); // object_pairs, internal: record-pairs
+        // Object functions
+        FUNCTION_NAME_MAP.put("record-merge", "object-merge"); // record-merge, internal: object-merge
+        // record-get-fields, internal: object-get-fields
+        FUNCTION_NAME_MAP.put("record-get-fields", "object-get-fields");
+        // record-get-field-value, internal: object-get-field-value
+        FUNCTION_NAME_MAP.put("record-get-field-value", "object-get-field-value");
+        // record-add-fields, internal: object-add-fields
+        FUNCTION_NAME_MAP.put("record-add-fields", "object-add-fields");
+        // record-remove-fields, internal: object-remove-fields
+        FUNCTION_NAME_MAP.put("record-remove-fields", "object-remove-fields");
     }
 
     private CommonFunctionMapUtil() {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
index 29d6e88..66581c4 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
@@ -167,18 +167,18 @@
     public static final FunctionIdentifier DEEP_EQUAL = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
             "deep-equal", 2);
 
-    // records
+    // objects
     public static final FunctionIdentifier RECORD_MERGE = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "record-merge", 2);
+            "object-merge", 2);
     public static final FunctionIdentifier REMOVE_FIELDS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "record-remove-fields", 2);
+            "object-remove-fields", 2);
     public static final FunctionIdentifier ADD_FIELDS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "record-add-fields", 2);
+            "object-add-fields", 2);
 
     public static final FunctionIdentifier CLOSED_RECORD_CONSTRUCTOR = new FunctionIdentifier(
-            FunctionConstants.ASTERIX_NS, "closed-record-constructor", FunctionIdentifier.VARARGS);
+            FunctionConstants.ASTERIX_NS, "closed-object-constructor", FunctionIdentifier.VARARGS);
     public static final FunctionIdentifier OPEN_RECORD_CONSTRUCTOR = new FunctionIdentifier(
-            FunctionConstants.ASTERIX_NS, "open-record-constructor", FunctionIdentifier.VARARGS);
+            FunctionConstants.ASTERIX_NS, "open-object-constructor", FunctionIdentifier.VARARGS);
     public static final FunctionIdentifier FIELD_ACCESS_BY_INDEX = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
             "field-access-by-index", 2);
     public static final FunctionIdentifier FIELD_ACCESS_BY_NAME = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
@@ -186,11 +186,11 @@
     public static final FunctionIdentifier FIELD_ACCESS_NESTED = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
             "field-access-nested", 2);
     public static final FunctionIdentifier GET_RECORD_FIELDS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "get-record-fields", 1);
+            "get-object-fields", 1);
     public static final FunctionIdentifier GET_RECORD_FIELD_VALUE = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "get-record-field-value", 2);
+            "get-object-field-value", 2);
     public static final FunctionIdentifier RECORD_PAIRS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "record-pairs", FunctionIdentifier.VARARGS);
+            "object-pairs", FunctionIdentifier.VARARGS);
 
     // numeric
     public static final FunctionIdentifier NUMERIC_UNARY_MINUS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
@@ -646,7 +646,7 @@
     public static final FunctionIdentifier INJECT_FAILURE = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
             "inject-failure", 2);
     public static final FunctionIdentifier FLOW_RECORD = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
-            "flow-record", 1);
+            "flow-object", 1);
     public static final FunctionIdentifier CAST_TYPE = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
             "cast", 1);
 
@@ -1055,7 +1055,7 @@
         addPrivateFunction(UNORDERED_LIST_CONSTRUCTOR, UnorderedListConstructorTypeComputer.INSTANCE, true);
         addFunction(WORD_TOKENS, OrderedListOfAStringTypeComputer.INSTANCE, true);
 
-        // records
+        // objects
         addFunction(RECORD_MERGE, RecordMergeTypeComputer.INSTANCE, true);
         addFunction(ADD_FIELDS, RecordAddFieldsTypeComputer.INSTANCE, true);
         addFunction(REMOVE_FIELDS, RecordRemoveFieldsTypeComputer.INSTANCE, true);