diff --git a/dotnet/src/Core/UtfAnyString.cs b/dotnet/src/Core/UtfAnyString.cs
new file mode 100644
index 0000000..34ebd40
--- /dev/null
+++ b/dotnet/src/Core/UtfAnyString.cs
@@ -0,0 +1,480 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+// ------------------------------------------------------------
+
+#pragma warning disable CA2225 // Operator overloads have named alternates
+
+// ReSharper disable once UseNameofExpression
+namespace Microsoft.Azure.Cosmos.Core.Utf8
+{
+    using System;
+    using System.Diagnostics;
+    using System.Runtime.CompilerServices;
+
+    /// <summary>A string whose memory representation may be either UTF8 or UTF16.</summary>
+    /// <remarks>
+    /// This type supports polymorphic use of <see cref="string" /> and <see cref="Utf8String" />
+    /// when equality, hashing, and comparison are needed against either encoding.  An API leveraging
+    /// <see cref="UtfAnyString" /> can avoid separate method overloads while still accepting either
+    /// encoding without imposing additional allocations.
+    /// </remarks>
+    [DebuggerDisplay("{ToString()}")]
+    public readonly struct UtfAnyString :
+        IEquatable<UtfAnyString>, IComparable<UtfAnyString>,
+        IEquatable<Utf8String>, IComparable<Utf8String>,
+        IEquatable<string>, IComparable<string>
+    {
+        public static UtfAnyString Empty => string.Empty;
+
+        private readonly object buffer;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public UtfAnyString(string utf16String)
+        {
+            this.buffer = utf16String;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public UtfAnyString(Utf8String utf8String)
+        {
+            this.buffer = utf8String;
+        }
+
+        public bool IsUtf8 => this.buffer is Utf8String;
+
+        public bool IsUtf16 => this.buffer is string;
+
+        /// <summary>True if the length is empty.</summary>
+        public bool IsNull => object.ReferenceEquals(null, this.buffer);
+
+        /// <summary>True if the length is empty.</summary>
+        public bool IsEmpty
+        {
+            get
+            {
+                if (object.ReferenceEquals(null, this.buffer))
+                {
+                    return false;
+                }
+
+                switch (this.buffer)
+                {
+                    case string s:
+                        return s.Length == 0;
+                    default:
+                        return ((Utf8String)this.buffer).IsEmpty;
+                }
+            }
+        }
+
+        public static implicit operator UtfAnyString(string utf16String)
+        {
+            return new UtfAnyString(utf16String);
+        }
+
+        public static implicit operator string(UtfAnyString str)
+        {
+            return str.buffer?.ToString();
+        }
+
+        public override string ToString()
+        {
+            // ReSharper disable once AssignNullToNotNullAttribute
+            return this.buffer?.ToString();
+        }
+
+        public Utf8String ToUtf8String()
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return null;
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return Utf8String.TranscodeUtf16(s);
+                default:
+                    return (Utf8String)this.buffer;
+            }
+        }
+
+        public bool ReferenceEquals(UtfAnyString other)
+        {
+            return this.buffer == other.buffer;
+        }
+
+        public bool Equals(UtfAnyString other)
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return object.ReferenceEquals(null, other.buffer);
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return other.Equals(s);
+                default:
+                    return other.Equals((Utf8String)this.buffer);
+            }
+        }
+
+        public bool Equals(Utf8Span other)
+        {
+            return other.Equals(this.buffer);
+        }
+
+        public override bool Equals(object obj)
+        {
+            switch (obj)
+            {
+                case string s:
+                    return this.Equals(s);
+                case Utf8String s:
+                    return this.Equals(s);
+                case UtfAnyString s:
+                    return this.Equals(s);
+            }
+
+            return false;
+        }
+
+        public bool Equals(Utf8String other)
+        {
+            if (object.ReferenceEquals(null, other))
+            {
+                return object.ReferenceEquals(null, this.buffer);
+            }
+
+            return other.Equals(this.buffer);
+        }
+
+        public bool Equals(string other)
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return object.ReferenceEquals(null, other);
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return string.Equals(s, other, StringComparison.Ordinal);
+                default:
+                    return ((Utf8String)this.buffer).Equals(other);
+            }
+        }
+
+        public static bool operator ==(UtfAnyString left, UtfAnyString right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(UtfAnyString left, UtfAnyString right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator ==(UtfAnyString left, string right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(UtfAnyString left, string right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator ==(string left, UtfAnyString right)
+        {
+            return right.Equals(left);
+        }
+
+        public static bool operator !=(string left, UtfAnyString right)
+        {
+            return !right.Equals(left);
+        }
+
+        public static bool operator ==(UtfAnyString left, Utf8String right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(UtfAnyString left, Utf8String right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator ==(Utf8String left, UtfAnyString right)
+        {
+            return right.Equals(left);
+        }
+
+        public static bool operator !=(Utf8String left, UtfAnyString right)
+        {
+            return !right.Equals(left);
+        }
+
+        public static bool operator ==(UtfAnyString left, Utf8Span right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(UtfAnyString left, Utf8Span right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator ==(Utf8Span left, UtfAnyString right)
+        {
+            return right.Equals(left);
+        }
+
+        public static bool operator !=(Utf8Span left, UtfAnyString right)
+        {
+            return !right.Equals(left);
+        }
+
+        public override int GetHashCode()
+        {
+            uint hash1 = 5381;
+            uint hash2 = hash1;
+
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return unchecked((int)(hash1 + (hash2 * 1566083941)));
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    unchecked
+                    {
+                        Utf16LittleEndianCodePointEnumerator thisEnumerator = new Utf16LittleEndianCodePointEnumerator(s);
+                        for (int i = 0; thisEnumerator.MoveNext(); i++)
+                        {
+                            uint c = thisEnumerator.Current;
+                            if (i % 2 == 0)
+                            {
+                                hash1 = ((hash1 << 5) + hash1) ^ c;
+                            }
+                            else
+                            {
+                                hash2 = ((hash2 << 5) + hash2) ^ c;
+                            }
+                        }
+
+                        return (int)(hash1 + (hash2 * 1566083941));
+                    }
+
+                default:
+                    return this.buffer.GetHashCode();
+            }
+        }
+
+        public static bool operator <(UtfAnyString left, UtfAnyString right)
+        {
+            return left.CompareTo(right) < 0;
+        }
+
+        public static bool operator <=(UtfAnyString left, UtfAnyString right)
+        {
+            return left.CompareTo(right) <= 0;
+        }
+
+        public static bool operator >(UtfAnyString left, UtfAnyString right)
+        {
+            return left.CompareTo(right) > 0;
+        }
+
+        public static bool operator >=(UtfAnyString left, UtfAnyString right)
+        {
+            return left.CompareTo(right) >= 0;
+        }
+
+        public static bool operator <(UtfAnyString left, string right)
+        {
+            return left.CompareTo(right) < 0;
+        }
+
+        public static bool operator <=(UtfAnyString left, string right)
+        {
+            return left.CompareTo(right) <= 0;
+        }
+
+        public static bool operator >(UtfAnyString left, string right)
+        {
+            return left.CompareTo(right) > 0;
+        }
+
+        public static bool operator >=(UtfAnyString left, string right)
+        {
+            return left.CompareTo(right) >= 0;
+        }
+
+        public static bool operator <(string left, UtfAnyString right)
+        {
+            return right.CompareTo(left) >= 0;
+        }
+
+        public static bool operator <=(string left, UtfAnyString right)
+        {
+            return right.CompareTo(left) > 0;
+        }
+
+        public static bool operator >(string left, UtfAnyString right)
+        {
+            return right.CompareTo(left) <= 0;
+        }
+
+        public static bool operator >=(string left, UtfAnyString right)
+        {
+            return right.CompareTo(left) < 0;
+        }
+
+        public static bool operator <(UtfAnyString left, Utf8String right)
+        {
+            return left.CompareTo(right) < 0;
+        }
+
+        public static bool operator <=(UtfAnyString left, Utf8String right)
+        {
+            return left.CompareTo(right) <= 0;
+        }
+
+        public static bool operator >(UtfAnyString left, Utf8String right)
+        {
+            return left.CompareTo(right) > 0;
+        }
+
+        public static bool operator >=(UtfAnyString left, Utf8String right)
+        {
+            return left.CompareTo(right) >= 0;
+        }
+
+        public static bool operator <(Utf8String left, UtfAnyString right)
+        {
+            return right.CompareTo(left) >= 0;
+        }
+
+        public static bool operator <=(Utf8String left, UtfAnyString right)
+        {
+            return right.CompareTo(left) > 0;
+        }
+
+        public static bool operator >(Utf8String left, UtfAnyString right)
+        {
+            return right.CompareTo(left) <= 0;
+        }
+
+        public static bool operator >=(Utf8String left, UtfAnyString right)
+        {
+            return right.CompareTo(left) < 0;
+        }
+
+        public static bool operator <(UtfAnyString left, Utf8Span right)
+        {
+            return left.CompareTo(right) < 0;
+        }
+
+        public static bool operator <=(UtfAnyString left, Utf8Span right)
+        {
+            return left.CompareTo(right) <= 0;
+        }
+
+        public static bool operator >(UtfAnyString left, Utf8Span right)
+        {
+            return left.CompareTo(right) > 0;
+        }
+
+        public static bool operator >=(UtfAnyString left, Utf8Span right)
+        {
+            return left.CompareTo(right) >= 0;
+        }
+
+        public static bool operator <(Utf8Span left, UtfAnyString right)
+        {
+            return right.CompareTo(left) >= 0;
+        }
+
+        public static bool operator <=(Utf8Span left, UtfAnyString right)
+        {
+            return right.CompareTo(left) > 0;
+        }
+
+        public static bool operator >(Utf8Span left, UtfAnyString right)
+        {
+            return right.CompareTo(left) <= 0;
+        }
+
+        public static bool operator >=(Utf8Span left, UtfAnyString right)
+        {
+            return right.CompareTo(left) < 0;
+        }
+
+        public int CompareTo(UtfAnyString other)
+        {
+            if (object.ReferenceEquals(null, other.buffer))
+            {
+                return object.ReferenceEquals(null, this.buffer) ? 0 : 1;
+            }
+
+            switch (other.buffer)
+            {
+                case string s:
+                    return this.CompareTo(s);
+                default:
+                    return this.CompareTo((Utf8String)other.buffer);
+            }
+        }
+
+        public int CompareTo(Utf8String other)
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return object.ReferenceEquals(null, other) ? 0 : -1;
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return -other.Span.CompareTo(s);
+                default:
+                    return -other.Span.CompareTo((Utf8String)this.buffer);
+            }
+        }
+
+        public int CompareTo(Utf8Span other)
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return -1;
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return -other.CompareTo(s);
+                default:
+                    return -other.CompareTo((Utf8String)this.buffer);
+            }
+        }
+
+        public int CompareTo(string other)
+        {
+            if (object.ReferenceEquals(null, this.buffer))
+            {
+                return object.ReferenceEquals(null, other) ? 0 : -1;
+            }
+
+            switch (this.buffer)
+            {
+                case string s:
+                    return string.Compare(s, other, StringComparison.Ordinal);
+                default:
+                    return ((Utf8String)this.buffer).CompareTo(other);
+            }
+        }
+    }
+}
diff --git a/jre/pom.xml b/jre/pom.xml
index b558cb4..667fd75 100644
--- a/jre/pom.xml
+++ b/jre/pom.xml
@@ -36,7 +36,7 @@ Licensed under the MIT License.
     <site.url/>
     <test.groups>unit</test.groups>
     <javadoc.opts/>
-    <guava.version>27.0.1-jre</guava.version>
+    <guava.version>28.0-jre</guava.version>
     <jackson.version>2.9.9</jackson.version>
     <mockito.version>1.10.19</mockito.version>
     <mongodb.version>3.11.0</mongodb.version>
diff --git a/jre/src/main/java/com/azure/data/cosmos/core/Out.java b/jre/src/main/java/com/azure/data/cosmos/core/Out.java
new file mode 100644
index 0000000..ac268e7
--- /dev/null
+++ b/jre/src/main/java/com/azure/data/cosmos/core/Out.java
@@ -0,0 +1,81 @@
+//------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+package com.azure.data.cosmos.core;
+
+import java.util.Objects;
+
+/**
+ * A container object which may or may not contain a non-null value
+ *
+ * This is a value-based class and as such use of identity-sensitive operations--including reference equality
+ * ({@code ==}), identity hash code, or synchronization--on instances of {@Out} may have unpredictable results and
+ * should be avoided.
+ *
+ * @param <T>
+ */
+public final class Out<T> {
+
+    private volatile T value;
+
+    public T get() {
+        return value;
+    }
+
+    public void set(T value) {
+        this.value = value;
+    }
+
+    /**
+     * {@code true} if there is a value present, otherwise {@code false}
+     * <p>
+     * This is equivalent to evaluating the expression {@code out.get() == null}.
+     *
+     * @return {@code true} if there is a value present, otherwise {@code false}
+     */
+    public boolean isPresent() {
+        return value != null;
+    }
+
+    /**
+     * Indicates whether some other object is equal to this {@link Out} value. The other object is considered equal if:
+     * <ul>
+     * <li>it is also an {@link Out} and;
+     * <li>both instances have no value present or;
+     * <li>the present values are equal to each other as determined by {@link T#equals(Object)}}.
+     * </ul>
+     *
+     * @param other an object to be tested for equality
+     * @return {code true} if the other object is equal to this object; otherwise {@code false}
+     */
+    @Override
+    public boolean equals(Object other) {
+
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof Out)) {
+            return false;
+        }
+
+        return Objects.equals(value, ((Out)other).value);
+    }
+
+    /**
+     * Returns the hash code value of the present value, if any, or 0 (zero) if
+     * no value is present.
+     *
+     * @return hash code value of the present value or 0 if no value is present
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(value);
+    }
+
+    @Override
+    public String toString() {
+        return value == null ? "null" : value.toString();
+    }
+}
diff --git a/jre/src/main/java/com/azure/data/cosmos/core/OutObject.java b/jre/src/main/java/com/azure/data/cosmos/core/OutObject.java
deleted file mode 100644
index ed309bd..0000000
--- a/jre/src/main/java/com/azure/data/cosmos/core/OutObject.java
+++ /dev/null
@@ -1,18 +0,0 @@
-//------------------------------------------------------------
-//  Copyright (c) Microsoft Corporation.  All rights reserved.
-//------------------------------------------------------------
-
-package com.azure.data.cosmos.core;
-
-public final class OutObject<T> {
-
-    private T value;
-
-    public T get() {
-        return value;
-    }
-
-    public void set(T value) {
-        this.value = value;
-    }
-}
diff --git a/jre/src/main/java/com/azure/data/cosmos/core/RefObject.java b/jre/src/main/java/com/azure/data/cosmos/core/RefObject.java
deleted file mode 100644
index e49fbd8..0000000
--- a/jre/src/main/java/com/azure/data/cosmos/core/RefObject.java
+++ /dev/null
@@ -1,22 +0,0 @@
-//------------------------------------------------------------
-//  Copyright (c) Microsoft Corporation.  All rights reserved.
-//------------------------------------------------------------
-
-package com.azure.data.cosmos.core;
-
-public final class RefObject<T> {
-
-    private T value;
-
-    public RefObject(T value) {
-        this.set(value);
-    }
-
-    public T get() {
-        return value;
-    }
-
-    public void set(T value) {
-        this.value = value;
-    }
-}
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/core/Reference.java b/jre/src/main/java/com/azure/data/cosmos/core/Reference.java
new file mode 100644
index 0000000..18de7eb
--- /dev/null
+++ b/jre/src/main/java/com/azure/data/cosmos/core/Reference.java
@@ -0,0 +1,75 @@
+//------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+package com.azure.data.cosmos.core;
+
+import java.util.Objects;
+
+/**
+ * A container object which may or may not contain a non-null value
+ *
+ * This is a value-based class and as such use of identity-sensitive operations--including reference equality
+ * ({@code ==}), identity hash code, or synchronization--on instances of {@Ref} may have unpredictable results and
+ * should be avoided.
+ *
+ * @param <T>
+ */
+public final class Reference<T> {
+
+    private volatile T value;
+
+    public Reference(T value) {
+        this.set(value);
+    }
+
+    public T get() {
+        return value;
+    }
+
+    public void set(T value) {
+        this.value = value;
+    }
+
+    /**
+     * {@code true} if there is a value present, otherwise {@code false}
+     *
+     * This is equivalent to evaluating the expression {@code ref.get() == null}.
+     *
+     * @return {@code true} if there is a value present, otherwise {@code false}
+     */
+    public boolean isPresent() {
+        return value != null;
+    }
+
+    /**
+     * Indicates whether some other object is equal to this {@link Reference} value. The other object is considered equal if:
+     * <ul>
+     * <li>it is also an {@link Reference} and;
+     * <li>both instances have no value present or;
+     * <li>the present values are equal to each other as determined by {@link T#equals(Object)}}.
+     * </ul>
+     *
+     * @param other an object to be tested for equality
+     * @return {code true} if the other object is equal to this object; otherwise {@code false}
+     */
+    @Override
+    public boolean equals(Object other) {
+
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof Reference)) {
+            return false;
+        }
+
+        return Objects.equals(value, ((Reference)other).value);
+    }
+
+
+    @Override
+    public String toString() {
+        return value == null ? "null" : value.toString();
+    }
+}
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/core/Utf8String.java b/jre/src/main/java/com/azure/data/cosmos/core/Utf8String.java
index 41f70db..f983da3 100644
--- a/jre/src/main/java/com/azure/data/cosmos/core/Utf8String.java
+++ b/jre/src/main/java/com/azure/data/cosmos/core/Utf8String.java
@@ -251,10 +251,10 @@ public final class Utf8String implements CharSequence, Comparable<Utf8String> {
     }
 
     /**
-     * Creates a <see cref="Utf8String" /> from a UTF16 encoding string.
+     * Creates a {@link Utf8String} from a UTF16 encoding string.
      *
      * @param string The UTF16 encoding string.
-     * @return A new <see cref="Utf8String" />.
+     * @return A new {@link Utf8String}.
      * <p>
      * This method must transcode the UTF-16 into UTF-8 which both requires allocation and is a size of data operation.
      */
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/Float128.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/Float128.java
index 98cce6e..139afb4 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/Float128.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/Float128.java
@@ -36,7 +36,7 @@ package com.azure.data.cosmos.serialization.hybridrow;
 //C# TO JAVA CONVERTER WARNING: Java has no equivalent to the C# readonly struct:
 public final class Float128 {
     /**
-     * The size (in bytes) of a <see cref="Float128" />.
+     * The size (in bytes) of a {@link Float128}.
      */
     public static final int Size = (Long.SIZE / Byte.SIZE) + (Long.SIZE / Byte.SIZE);
     /**
@@ -51,7 +51,7 @@ public final class Float128 {
     public long Low;
 
     /**
-     * Initializes a new instance of the <see cref="Float128" /> struct.
+     * Initializes a new instance of the {@link Float128} struct.
      *
      * @param high the high-order 64 bits.
      * @param low  the low-order 64 bits.
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/HybridRowHeader.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/HybridRowHeader.java
index e92c0f4..1764757 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/HybridRowHeader.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/HybridRowHeader.java
@@ -28,7 +28,7 @@ public final class HybridRowHeader {
     private HybridRowVersion Version = HybridRowVersion.values()[0];
 
     /**
-     * Initializes a new instance of the <see cref="HybridRowHeader"/> struct.
+     * Initializes a new instance of the {@link HybridRowHeader} struct.
      *
      * @param version  The version of the HybridRow library used to write this row.
      * @param schemaId The unique identifier of the schema whose layout was used to write this row.
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/NullValue.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/NullValue.java
index a6456f1..a00af52 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/NullValue.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/NullValue.java
@@ -17,12 +17,12 @@ package com.azure.data.cosmos.serialization.hybridrow;
 public final class NullValue implements IEquatable<NullValue> {
     /**
      * The default null literal.
-     * This is the same value as default(<see cref="NullValue" />).
+     * This is the same value as default({@link NullValue}).
      */
     public static final NullValue Default = new NullValue();
 
     /**
-     * Returns true if this is the same value as <see cref="other" />.
+     * Returns true if this is the same value as {@link other}.
      *
      * @param other The value to compare against.
      * @return True if the two values are the same.
@@ -32,7 +32,7 @@ public final class NullValue implements IEquatable<NullValue> {
     }
 
     /**
-     * <see cref="object.Equals(object)" /> overload.
+     * {@link object.Equals(object)} overload.
      */
     @Override
     public boolean equals(Object obj) {
@@ -44,7 +44,7 @@ public final class NullValue implements IEquatable<NullValue> {
     }
 
     /**
-     * <see cref="object.GetHashCode" /> overload.
+     * {@link object.GetHashCode} overload.
      */
     @Override
     public int hashCode() {
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowBuffer.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowBuffer.java
index a67315d..1b29692 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowBuffer.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowBuffer.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.Layout;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutBit;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode;
@@ -37,9 +38,9 @@ import static com.google.common.base.Strings.lenientFormat;
 //C# TO JAVA CONVERTER WARNING: Java has no equivalent to the C# ref struct:
 public final class RowBuffer {
     /**
-     * A sequence of bytes managed by this <see cref="RowBuffer" />.
+     * A sequence of bytes managed by this {@link RowBuffer}.
      * <p>
-     * A Hybrid Row begins in the 0-th byte of the <see cref="RowBuffer" />.  Remaining byte
+     * A Hybrid Row begins in the 0-th byte of the {@link RowBuffer}.  Remaining byte
      * sequence is defined by the Hybrid Row grammar.
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -61,7 +62,7 @@ public final class RowBuffer {
     private LayoutResolver resolver;
 
     /**
-     * Initializes a new instance of the <see cref="RowBuffer" /> struct.
+     * Initializes a new instance of the {@link RowBuffer} struct.
      *
      * @param capacity Initial buffer capacity.
      * @param resizer  Optional memory resizer.
@@ -87,7 +88,7 @@ public final class RowBuffer {
     }
 
     /**
-     * Initializes a new instance of the <see cref="RowBuffer" /> struct from an existing buffer.
+     * Initializes a new instance of the {@link RowBuffer} struct from an existing buffer.
      *
      * @param buffer   The buffer.  The row takes ownership of the buffer and the caller should not
      *                 maintain a pointer or mutate the buffer after this call returns.
@@ -163,7 +164,7 @@ public final class RowBuffer {
             LayoutColumn col = columns[i];
             if (this.ReadBit(scopeOffset, col.getNullBit().clone())) {
                 int lengthSizeInBytes;
-                OutObject<Integer> tempOut_lengthSizeInBytes = new OutObject<Integer>();
+                Out<Integer> tempOut_lengthSizeInBytes = new Out<Integer>();
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: ulong valueSizeInBytes = this.Read7BitEncodedUInt(offset, out int lengthSizeInBytes);
                 long valueSizeInBytes = this.Read7BitEncodedUInt(offset, tempOut_lengthSizeInBytes);
@@ -184,7 +185,7 @@ public final class RowBuffer {
      * encoding.
      *
      * @param value The value to be encoded.
-     * @return The number of bytes needed to store the varuint encoding of <see cref="value" />.
+     * @return The number of bytes needed to store the varuint encoding of {@link value}.
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal static int Count7BitEncodedUInt(ulong value)
@@ -216,7 +217,7 @@ public final class RowBuffer {
      *
      * @param edit The field to delete.
      */
-    public void DeleteSparse(RefObject<RowCursor> edit) {
+    public void DeleteSparse(Reference<RowCursor> edit) {
         // If the field doesn't exist, then nothing to do.
         if (!edit.get().exists) {
             return;
@@ -224,11 +225,11 @@ public final class RowBuffer {
 
         int numBytes = 0;
         int _;
-        OutObject<Integer> tempOut__ = new OutObject<Integer>();
+        Out<Integer> tempOut__ = new Out<Integer>();
         int _;
-        OutObject<Integer> tempOut__2 = new OutObject<Integer>();
+        Out<Integer> tempOut__2 = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, edit.get().cellType, edit.get().cellTypeArgs.clone(), numBytes,
 			RowOptions.Delete, tempOut__, tempOut__2, tempOut_shift);
         shift = tempOut_shift.get();
@@ -239,7 +240,7 @@ public final class RowBuffer {
 
     public void DeleteVariable(int offset, boolean isVarint) {
         int spaceAvailable;
-        OutObject<Integer> tempOut_spaceAvailable = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceAvailable = new Out<Integer>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ulong existingValueBytes = this.Read7BitEncodedUInt(offset, out int spaceAvailable);
         long existingValueBytes = this.Read7BitEncodedUInt(offset, tempOut_spaceAvailable);
@@ -294,23 +295,23 @@ public final class RowBuffer {
      * @param srcEdit The field to move into the set/map.
      * @return The prepared edit context.
      */
-    public RowCursor PrepareSparseMove(RefObject<RowCursor> scope, RefObject<RowCursor> srcEdit) {
+    public RowCursor PrepareSparseMove(Reference<RowCursor> scope, Reference<RowCursor> srcEdit) {
         checkArgument(scope.get().scopeType.IsUniqueScope);
 
         checkArgument(scope.get().index == 0);
         RowCursor dstEdit;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-		// cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+		// cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.get().Clone(out dstEdit);
 
         dstEdit.metaOffset = scope.get().valueOffset;
         int srcSize = this.SparseComputeSize(srcEdit);
         int srcBytes = srcSize - (srcEdit.get().valueOffset - srcEdit.get().metaOffset);
         while (dstEdit.index < dstEdit.count) {
-            RefObject<RowCursor> tempRef_dstEdit =
-				new RefObject<RowCursor>(dstEdit);
-            this.ReadSparseMetadata(tempRef_dstEdit);
-            dstEdit = tempRef_dstEdit.get();
+            Reference<RowCursor> tempReference_dstEdit =
+				new Reference<RowCursor>(dstEdit);
+            this.ReadSparseMetadata(tempReference_dstEdit);
+            dstEdit = tempReference_dstEdit.get();
             Contract.Assert(dstEdit.pathOffset ==
             default)
 
@@ -319,10 +320,10 @@ public final class RowBuffer {
                 if (scope.get().scopeType instanceof LayoutTypedMap) {
                     cmp = this.CompareKeyValueFieldValue(srcEdit.get().clone(), dstEdit);
                 } else {
-                    RefObject<RowCursor> tempRef_dstEdit2 =
-						new RefObject<RowCursor>(dstEdit);
-                    elmSize = this.SparseComputeSize(tempRef_dstEdit2);
-                    dstEdit = tempRef_dstEdit2.get();
+                    Reference<RowCursor> tempReference_dstEdit2 =
+						new Reference<RowCursor>(dstEdit);
+                    elmSize = this.SparseComputeSize(tempReference_dstEdit2);
+                    dstEdit = tempReference_dstEdit2.get();
                     int elmBytes = elmSize - (dstEdit.valueOffset - dstEdit.metaOffset);
                     cmp = this.CompareFieldValue(srcEdit.get().clone(), srcBytes, dstEdit, elmBytes);
                 }
@@ -332,10 +333,10 @@ public final class RowBuffer {
                     return dstEdit;
                 }
 
-                RefObject<RowCursor> tempRef_dstEdit3 =
-					new RefObject<RowCursor>(dstEdit);
-                elmSize = (elmSize == -1) ? this.SparseComputeSize(tempRef_dstEdit3) : elmSize;
-                dstEdit = tempRef_dstEdit3.get();
+                Reference<RowCursor> tempReference_dstEdit3 =
+					new Reference<RowCursor>(dstEdit);
+                elmSize = (elmSize == -1) ? this.SparseComputeSize(tempReference_dstEdit3) : elmSize;
+                dstEdit = tempReference_dstEdit3.get();
                 dstEdit.index++;
                 dstEdit.metaOffset += elmSize;
         }
@@ -346,13 +347,13 @@ public final class RowBuffer {
         return dstEdit;
     }
 
-    public long Read7BitEncodedInt(int offset, OutObject<Integer> lenInBytes) {
+    public long Read7BitEncodedInt(int offset, Out<Integer> lenInBytes) {
         return RowBuffer.RotateSignToMsb(this.Read7BitEncodedUInt(offset, lenInBytes));
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal ulong Read7BitEncodedUInt(int offset, out int lenInBytes)
-    public long Read7BitEncodedUInt(int offset, OutObject<Integer> lenInBytes) {
+    public long Read7BitEncodedUInt(int offset, Out<Integer> lenInBytes) {
         // Read out an unsigned long 7 bits at a time.  The high bit of the byte,
         // when set, indicates there are more bytes.
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -509,10 +510,10 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal ReadOnlySpan<byte> ReadSparseBinary(ref RowCursor edit)
-    public ReadOnlySpan<Byte> ReadSparseBinary(RefObject<RowCursor> edit) {
+    public ReadOnlySpan<Byte> ReadSparseBinary(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Binary);
         int sizeLenInBytes;
-        OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ReadOnlySpan<byte> span = this.ReadBinary(edit.valueOffset, out int sizeLenInBytes);
         ReadOnlySpan<Byte> span = this.ReadBinary(edit.get().valueOffset, tempOut_sizeLenInBytes);
@@ -521,89 +522,89 @@ public final class RowBuffer {
         return span;
     }
 
-    public boolean ReadSparseBool(RefObject<RowCursor> edit) {
+    public boolean ReadSparseBool(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Boolean);
         edit.get().endOffset = edit.get().valueOffset;
         return edit.get().cellType == LayoutType.Boolean;
     }
 
-    public LocalDateTime ReadSparseDateTime(RefObject<RowCursor> edit) {
+    public LocalDateTime ReadSparseDateTime(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.DateTime);
         edit.get().endOffset = edit.get().valueOffset + 8;
         return this.ReadDateTime(edit.get().valueOffset);
     }
 
-    public BigDecimal ReadSparseDecimal(RefObject<RowCursor> edit) {
+    public BigDecimal ReadSparseDecimal(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Decimal);
         // TODO: C# TO JAVA CONVERTER: There is no Java equivalent to 'sizeof':
         edit.get().endOffset = edit.get().valueOffset + sizeof(BigDecimal);
         return this.ReadDecimal(edit.get().valueOffset);
     }
 
-    public Float128 ReadSparseFloat128(RefObject<RowCursor> edit) {
+    public Float128 ReadSparseFloat128(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Float128);
         edit.get().endOffset = edit.get().valueOffset + Float128.Size;
         return this.ReadFloat128(edit.get().valueOffset).clone();
     }
 
-    public float ReadSparseFloat32(RefObject<RowCursor> edit) {
+    public float ReadSparseFloat32(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Float32);
         edit.get().endOffset = edit.get().valueOffset + (Float.SIZE / Byte.SIZE);
         return this.ReadFloat32(edit.get().valueOffset);
     }
 
-    public double ReadSparseFloat64(RefObject<RowCursor> edit) {
+    public double ReadSparseFloat64(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Float64);
         edit.get().endOffset = edit.get().valueOffset + (Double.SIZE / Byte.SIZE);
         return this.ReadFloat64(edit.get().valueOffset);
     }
 
-    public UUID ReadSparseGuid(RefObject<RowCursor> edit) {
+    public UUID ReadSparseGuid(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Guid);
         edit.get().endOffset = edit.get().valueOffset + 16;
         return this.ReadGuid(edit.get().valueOffset);
     }
 
-    public short ReadSparseInt16(RefObject<RowCursor> edit) {
+    public short ReadSparseInt16(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Int16);
         edit.get().endOffset = edit.get().valueOffset + (Short.SIZE / Byte.SIZE);
         return this.ReadInt16(edit.get().valueOffset);
     }
 
-    public int ReadSparseInt32(RefObject<RowCursor> edit) {
+    public int ReadSparseInt32(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Int32);
         edit.get().endOffset = edit.get().valueOffset + (Integer.SIZE / Byte.SIZE);
         return this.ReadInt32(edit.get().valueOffset);
     }
 
-    public long ReadSparseInt64(RefObject<RowCursor> edit) {
+    public long ReadSparseInt64(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Int64);
         edit.get().endOffset = edit.get().valueOffset + (Long.SIZE / Byte.SIZE);
         return this.ReadInt64(edit.get().valueOffset);
     }
 
-    public byte ReadSparseInt8(RefObject<RowCursor> edit) {
+    public byte ReadSparseInt8(Reference<RowCursor> edit) {
         // TODO: Remove calls to ReadSparsePrimitiveTypeCode once moved to V2 read.
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Int8);
         edit.get().endOffset = edit.get().valueOffset + (Byte.SIZE / Byte.SIZE);
         return this.ReadInt8(edit.get().valueOffset);
     }
 
-    public MongoDbObjectId ReadSparseMongoDbObjectId(RefObject<RowCursor> edit) {
+    public MongoDbObjectId ReadSparseMongoDbObjectId(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, MongoDbObjectId);
         edit.get().endOffset = edit.get().valueOffset + MongoDbObjectId.Size;
         return this.ReadMongoDbObjectId(edit.get().valueOffset).clone();
     }
 
-    public NullValue ReadSparseNull(RefObject<RowCursor> edit) {
+    public NullValue ReadSparseNull(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Null);
         edit.get().endOffset = edit.get().valueOffset;
         return NullValue.Default;
     }
 
-    public Utf8Span ReadSparsePath(RefObject<RowCursor> edit) {
+    public Utf8Span ReadSparsePath(Reference<RowCursor> edit) {
         Utf8String path;
-        OutObject<Utf8String> tempOut_path = new OutObject<Utf8String>();
+        Out<Utf8String> tempOut_path = new Out<Utf8String>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: if (edit.layout.Tokenizer.TryFindString((ulong)edit.pathToken, out Utf8String path))
         if (edit.get().layout.getTokenizer().TryFindString(edit.get().longValue().pathToken, tempOut_path)) {
@@ -617,10 +618,10 @@ public final class RowBuffer {
         return Utf8Span.UnsafeFromUtf8BytesNoValidation(this.buffer.Slice(edit.get().pathOffset, numBytes));
     }
 
-    public int ReadSparsePathLen(Layout layout, int offset, OutObject<Integer> pathLenInBytes,
-								 OutObject<Integer> pathOffset) {
+    public int ReadSparsePathLen(Layout layout, int offset, Out<Integer> pathLenInBytes,
+								 Out<Integer> pathOffset) {
         int sizeLenInBytes;
-        OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
         int token = (int)this.Read7BitEncodedUInt(offset, tempOut_sizeLenInBytes);
         sizeLenInBytes = tempOut_sizeLenInBytes.get();
         if (token < layout.getTokenizer().getCount()) {
@@ -635,10 +636,10 @@ public final class RowBuffer {
         return token;
     }
 
-    public Utf8Span ReadSparseString(RefObject<RowCursor> edit) {
+    public Utf8Span ReadSparseString(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.Utf8);
         int sizeLenInBytes;
-        OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
         Utf8Span span = this.ReadString(edit.get().valueOffset, tempOut_sizeLenInBytes);
         sizeLenInBytes = tempOut_sizeLenInBytes.get();
         edit.get().endOffset = edit.get().valueOffset + sizeLenInBytes + span.Length;
@@ -654,7 +655,7 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal ushort ReadSparseUInt16(ref RowCursor edit)
-    public short ReadSparseUInt16(RefObject<RowCursor> edit) {
+    public short ReadSparseUInt16(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.UInt16);
         edit.get().endOffset = edit.get().valueOffset + (Short.SIZE / Byte.SIZE);
         return this.ReadUInt16(edit.get().valueOffset);
@@ -662,7 +663,7 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal uint ReadSparseUInt32(ref RowCursor edit)
-    public int ReadSparseUInt32(RefObject<RowCursor> edit) {
+    public int ReadSparseUInt32(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.UInt32);
         edit.get().endOffset = edit.get().valueOffset + (Integer.SIZE / Byte.SIZE);
         return this.ReadUInt32(edit.get().valueOffset);
@@ -670,7 +671,7 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal ulong ReadSparseUInt64(ref RowCursor edit)
-    public long ReadSparseUInt64(RefObject<RowCursor> edit) {
+    public long ReadSparseUInt64(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.UInt64);
         edit.get().endOffset = edit.get().valueOffset + (Long.SIZE / Byte.SIZE);
         return this.ReadUInt64(edit.get().valueOffset);
@@ -678,22 +679,22 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal byte ReadSparseUInt8(ref RowCursor edit)
-    public byte ReadSparseUInt8(RefObject<RowCursor> edit) {
+    public byte ReadSparseUInt8(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.UInt8);
         edit.get().endOffset = edit.get().valueOffset + 1;
         return this.ReadUInt8(edit.get().valueOffset);
     }
 
-    public UnixDateTime ReadSparseUnixDateTime(RefObject<RowCursor> edit) {
+    public UnixDateTime ReadSparseUnixDateTime(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.UnixDateTime);
         edit.get().endOffset = edit.get().valueOffset + 8;
         return this.ReadUnixDateTime(edit.get().valueOffset).clone();
     }
 
-    public long ReadSparseVarInt(RefObject<RowCursor> edit) {
+    public long ReadSparseVarInt(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.VarInt);
         int sizeLenInBytes;
-        OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
         long value = this.Read7BitEncodedInt(edit.get().valueOffset, tempOut_sizeLenInBytes);
         sizeLenInBytes = tempOut_sizeLenInBytes.get();
         edit.get().endOffset = edit.get().valueOffset + sizeLenInBytes;
@@ -702,10 +703,10 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal ulong ReadSparseVarUInt(ref RowCursor edit)
-    public long ReadSparseVarUInt(RefObject<RowCursor> edit) {
+    public long ReadSparseVarUInt(Reference<RowCursor> edit) {
         this.ReadSparsePrimitiveTypeCode(edit, LayoutType.VarUInt);
         int sizeLenInBytes;
-        OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ulong value = this.Read7BitEncodedUInt(edit.valueOffset, out int sizeLenInBytes);
         long value = this.Read7BitEncodedUInt(edit.get().valueOffset, tempOut_sizeLenInBytes);
@@ -754,7 +755,7 @@ public final class RowBuffer {
     //ORIGINAL LINE: internal ReadOnlySpan<byte> ReadVariableBinary(int offset)
     public ReadOnlySpan<Byte> ReadVariableBinary(int offset) {
         int _;
-        OutObject<Integer> tempOut__ = new OutObject<Integer>();
+        Out<Integer> tempOut__ = new Out<Integer>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.ReadBinary(offset, out int _);
         ReadOnlySpan<Byte> tempVar = this.ReadBinary(offset, tempOut__);
@@ -764,7 +765,7 @@ public final class RowBuffer {
 
     public long ReadVariableInt(int offset) {
         int _;
-        OutObject<Integer> tempOut__ = new OutObject<Integer>();
+        Out<Integer> tempOut__ = new Out<Integer>();
         long tempVar = this.Read7BitEncodedInt(offset, tempOut__);
         _ = tempOut__.get();
         return tempVar;
@@ -772,7 +773,7 @@ public final class RowBuffer {
 
     public Utf8Span ReadVariableString(int offset) {
         int _;
-        OutObject<Integer> tempOut__ = new OutObject<Integer>();
+        Out<Integer> tempOut__ = new Out<Integer>();
         Utf8Span tempVar = this.ReadString(offset, tempOut__);
         _ = tempOut__.get();
         return tempVar;
@@ -782,7 +783,7 @@ public final class RowBuffer {
     //ORIGINAL LINE: internal ulong ReadVariableUInt(int offset)
     public long ReadVariableUInt(int offset) {
         int _;
-        OutObject<Integer> tempOut__ = new OutObject<Integer>();
+        Out<Integer> tempOut__ = new Out<Integer>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.Read7BitEncodedUInt(offset, out int _);
         long tempVar = this.Read7BitEncodedUInt(offset, tempOut__);
@@ -838,7 +839,7 @@ public final class RowBuffer {
     }
 
     /**
-     * Undoes the rotation introduced by <see cref="RotateSignToLsb" />.
+     * Undoes the rotation introduced by {@link RotateSignToLsb}.
      *
      * @param uvalue An unsigned value with the sign bit in the LSB.
      * @return A signed two's complement value encoding the same value.
@@ -893,7 +894,7 @@ public final class RowBuffer {
      *             </paramref>.
      * @return True if there is another field, false if there are no more.
      */
-    public boolean SparseIteratorMoveNext(RefObject<RowCursor> edit) {
+    public boolean SparseIteratorMoveNext(Reference<RowCursor> edit) {
         if (edit.get().cellType != null) {
             // Move to the next element of an indexed scope.
             if (edit.get().scopeType.IsIndexedScope) {
@@ -937,7 +938,7 @@ public final class RowBuffer {
      * @param immutable True if the new scope should be marked immutable (read-only).
      * @return A new scope beginning at the current iterator position.
      */
-    public RowCursor SparseIteratorReadScope(RefObject<RowCursor> edit, boolean immutable) {
+    public RowCursor SparseIteratorReadScope(Reference<RowCursor> edit, boolean immutable) {
         LayoutScope scopeType = edit.get().cellType instanceof LayoutScope ? (LayoutScope)edit.get().cellType :
             null;
         switch (scopeType) {
@@ -1093,18 +1094,18 @@ public final class RowBuffer {
         return this.buffer.Slice(0, this.length).ToArray();
     }
 
-    public void TypedCollectionMoveField(RefObject<RowCursor> dstEdit, RefObject<RowCursor> srcEdit
+    public void TypedCollectionMoveField(Reference<RowCursor> dstEdit, Reference<RowCursor> srcEdit
 		, RowOptions options) {
         int encodedSize = this.SparseComputeSize(srcEdit);
         int numBytes = encodedSize - (srcEdit.get().valueOffset - srcEdit.get().metaOffset);
 
         // Insert the field metadata into its new location.
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shiftInsert;
-        OutObject<Integer> tempOut_shiftInsert = new OutObject<Integer>();
+        Out<Integer> tempOut_shiftInsert = new Out<Integer>();
         this.EnsureSparse(dstEdit, srcEdit.get().cellType, srcEdit.get().cellTypeArgs.clone(), numBytes,
 			options, tempOut_metaBytes, tempOut_spaceNeeded, tempOut_shiftInsert);
         shiftInsert = tempOut_shiftInsert.get();
@@ -1123,10 +1124,10 @@ public final class RowBuffer {
         this.length += shiftInsert;
 
         // Delete the old location.
-        OutObject<Integer> tempOut_metaBytes2 = new OutObject<Integer>();
-        OutObject<Integer> tempOut_spaceNeeded2 = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes2 = new Out<Integer>();
+        Out<Integer> tempOut_spaceNeeded2 = new Out<Integer>();
         int shiftDelete;
-        OutObject<Integer> tempOut_shiftDelete = new OutObject<Integer>();
+        Out<Integer> tempOut_shiftDelete = new Out<Integer>();
         this.EnsureSparse(srcEdit, srcEdit.get().cellType, srcEdit.get().cellTypeArgs.clone(), numBytes,
 			RowOptions.Delete, tempOut_metaBytes2, tempOut_spaceNeeded2, tempOut_shiftDelete);
         shiftDelete = tempOut_shiftDelete.get();
@@ -1166,13 +1167,13 @@ public final class RowBuffer {
      * operation is idempotent.
      * </p>
      */
-    public Result TypedCollectionUniqueIndexRebuild(RefObject<RowCursor> scope) {
+    public Result TypedCollectionUniqueIndexRebuild(Reference<RowCursor> scope) {
         checkArgument(scope.get().scopeType.IsUniqueScope);
         checkArgument(scope.get().index == 0);
         RowCursor dstEdit;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
 		// cannot be
-        // converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // converted using the 'Out' helper class unless the method is within the code being modified:
         scope.get().Clone(out dstEdit);
         if (dstEdit.count <= 1) {
             return Result.Success;
@@ -1185,16 +1186,16 @@ public final class RowBuffer {
         new UniqueIndexItem[dstEdit.count];
         dstEdit.metaOffset = scope.get().valueOffset;
         for (; dstEdit.index < dstEdit.count; dstEdit.index++) {
-            RefObject<RowCursor> tempRef_dstEdit =
-				new RefObject<RowCursor>(dstEdit);
-            this.ReadSparseMetadata(tempRef_dstEdit);
-            dstEdit = tempRef_dstEdit.get();
+            Reference<RowCursor> tempReference_dstEdit =
+				new Reference<RowCursor>(dstEdit);
+            this.ReadSparseMetadata(tempReference_dstEdit);
+            dstEdit = tempReference_dstEdit.get();
             Contract.Assert(dstEdit.pathOffset ==
             default)
-				RefObject<RowCursor> tempRef_dstEdit2 =
-					new RefObject<RowCursor>(dstEdit);
-                int elmSize = this.SparseComputeSize(tempRef_dstEdit2);
-                dstEdit = tempRef_dstEdit2.get();
+				Reference<RowCursor> tempReference_dstEdit2 =
+					new Reference<RowCursor>(dstEdit);
+                int elmSize = this.SparseComputeSize(tempReference_dstEdit2);
+                dstEdit = tempReference_dstEdit2.get();
 
                 UniqueIndexItem tempVar = new UniqueIndexItem();
                 tempVar.Code = dstEdit.cellType.LayoutCode;
@@ -1286,15 +1287,15 @@ public final class RowBuffer {
     }
 
     public void WriteDateTime(int offset, LocalDateTime value) {
-        RefObject<LocalDateTime> tempRef_value = new RefObject<LocalDateTime>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<LocalDateTime> tempReference_value = new Reference<LocalDateTime>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteDecimal(int offset, BigDecimal value) {
-        RefObject<BigDecimal> tempRef_value = new RefObject<BigDecimal>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<BigDecimal> tempReference_value = new Reference<BigDecimal>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -1320,53 +1321,53 @@ public final class RowBuffer {
     }
 
     public void WriteFloat128(int offset, Float128 value) {
-        RefObject<Float128> tempRef_value =
-			new RefObject<Float128>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Float128> tempReference_value =
+			new Reference<Float128>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteFloat32(int offset, float value) {
-        RefObject<Float> tempRef_value = new RefObject<Float>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Float> tempReference_value = new Reference<Float>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteFloat64(int offset, double value) {
-        RefObject<Double> tempRef_value = new RefObject<Double>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Double> tempReference_value = new Reference<Double>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteGuid(int offset, UUID value) {
-        RefObject<UUID> tempRef_value = new RefObject<UUID>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<UUID> tempReference_value = new Reference<UUID>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteHeader(int offset, HybridRowHeader value) {
-        RefObject<HybridRowHeader> tempRef_value =
-			new RefObject<HybridRowHeader>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<HybridRowHeader> tempReference_value =
+			new Reference<HybridRowHeader>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteInt16(int offset, short value) {
-        RefObject<Short> tempRef_value = new RefObject<Short>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Short> tempReference_value = new Reference<Short>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteInt32(int offset, int value) {
-        RefObject<Integer> tempRef_value = new RefObject<Integer>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Integer> tempReference_value = new Reference<Integer>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteInt64(int offset, long value) {
-        RefObject<Long> tempRef_value = new RefObject<Long>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<Long> tempReference_value = new Reference<Long>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     public void WriteInt8(int offset, byte value) {
@@ -1377,21 +1378,21 @@ public final class RowBuffer {
     }
 
     public void WriteMongoDbObjectId(int offset, MongoDbObjectId value) {
-        RefObject<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId> tempRef_value =
-			new RefObject<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId> tempReference_value =
+			new Reference<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
-    public void WriteNullable(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
-                              UpdateOptions options, boolean hasValue, OutObject<RowCursor> newScope) {
+    public void WriteNullable(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
+                              UpdateOptions options, boolean hasValue, Out<RowCursor> newScope) {
         int numBytes = this.CountDefaultValue(scopeType, typeArgs.clone());
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1417,26 +1418,26 @@ public final class RowBuffer {
         newScope.get().index = 1;
 
         this.length += shift;
-        RefObject<RowBuffer> tempRef_this =
-			new RefObject<RowBuffer>(this);
-        RowCursorExtensions.MoveNext(newScope.get().clone(), tempRef_this);
-        this = tempRef_this.get();
+        Reference<RowBuffer> tempReference_this =
+			new Reference<RowBuffer>(this);
+        RowCursorExtensions.MoveNext(newScope.get().clone(), tempReference_this);
+        this = tempReference_this.get();
     }
 
     public void WriteSchemaId(int offset, SchemaId value) {
         this.WriteInt32(offset, value.getId());
     }
 
-    public void WriteSparseArray(RefObject<RowCursor> edit, LayoutScope scopeType, UpdateOptions options,
-                                 OutObject<RowCursor> newScope) {
+    public void WriteSparseArray(Reference<RowCursor> edit, LayoutScope scopeType, UpdateOptions options,
+                                 Out<RowCursor> newScope) {
         int numBytes = (LayoutCode.SIZE / Byte.SIZE); // end scope type code.
         TypeArgumentList typeArgs = TypeArgumentList.Empty;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1459,17 +1460,17 @@ public final class RowBuffer {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseBinary(ref RowCursor edit, ReadOnlySpan<byte> value, UpdateOptions
 	// options)
-    public void WriteSparseBinary(RefObject<RowCursor> edit, ReadOnlySpan<Byte> value, UpdateOptions options) {
+    public void WriteSparseBinary(Reference<RowCursor> edit, ReadOnlySpan<Byte> value, UpdateOptions options) {
         int len = value.Length;
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: int numBytes = len + RowBuffer.Count7BitEncodedUInt((ulong)len);
         int numBytes = len + RowBuffer.Count7BitEncodedUInt(len);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Binary, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1485,18 +1486,18 @@ public final class RowBuffer {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseBinary(ref RowCursor edit, ReadOnlySequence<byte> value, UpdateOptions
 	// options)
-    public void WriteSparseBinary(RefObject<RowCursor> edit, ReadOnlySequence<Byte> value,
+    public void WriteSparseBinary(Reference<RowCursor> edit, ReadOnlySequence<Byte> value,
                                   UpdateOptions options) {
         int len = (int)value.Length;
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: int numBytes = len + RowBuffer.Count7BitEncodedUInt((ulong)len);
         int numBytes = len + RowBuffer.Count7BitEncodedUInt(len);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Binary, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1509,14 +1510,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseBool(RefObject<RowCursor> edit, boolean value, UpdateOptions options) {
+    public void WriteSparseBool(Reference<RowCursor> edit, boolean value, UpdateOptions options) {
         int numBytes = 0;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, value ? LayoutType.Boolean : LayoutType.BooleanFalse, TypeArgumentList.Empty,
 			numBytes, options, tempOut_metaBytes, tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1529,14 +1530,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseDateTime(RefObject<RowCursor> edit, LocalDateTime value, UpdateOptions options) {
+    public void WriteSparseDateTime(Reference<RowCursor> edit, LocalDateTime value, UpdateOptions options) {
         int numBytes = 8;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.DateTime, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1549,15 +1550,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseDecimal(RefObject<RowCursor> edit, BigDecimal value, UpdateOptions options) {
+    public void WriteSparseDecimal(Reference<RowCursor> edit, BigDecimal value, UpdateOptions options) {
         // TODO: C# TO JAVA CONVERTER: There is no Java equivalent to 'sizeof':
         int numBytes = sizeof(BigDecimal);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Decimal, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1571,14 +1572,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseFloat128(RefObject<RowCursor> edit, Float128 value, UpdateOptions options) {
+    public void WriteSparseFloat128(Reference<RowCursor> edit, Float128 value, UpdateOptions options) {
         int numBytes = Float128.Size;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Float128, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1591,14 +1592,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseFloat32(RefObject<RowCursor> edit, float value, UpdateOptions options) {
+    public void WriteSparseFloat32(Reference<RowCursor> edit, float value, UpdateOptions options) {
         int numBytes = (Float.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Float32, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1611,14 +1612,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseFloat64(RefObject<RowCursor> edit, double value, UpdateOptions options) {
+    public void WriteSparseFloat64(Reference<RowCursor> edit, double value, UpdateOptions options) {
         int numBytes = (Double.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Float64, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1631,14 +1632,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseGuid(RefObject<RowCursor> edit, UUID value, UpdateOptions options) {
+    public void WriteSparseGuid(Reference<RowCursor> edit, UUID value, UpdateOptions options) {
         int numBytes = 16;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Guid, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1651,14 +1652,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseInt16(RefObject<RowCursor> edit, short value, UpdateOptions options) {
+    public void WriteSparseInt16(Reference<RowCursor> edit, short value, UpdateOptions options) {
         int numBytes = (Short.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Int16, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1671,14 +1672,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseInt32(RefObject<RowCursor> edit, int value, UpdateOptions options) {
+    public void WriteSparseInt32(Reference<RowCursor> edit, int value, UpdateOptions options) {
         int numBytes = (Integer.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Int32, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1691,14 +1692,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseInt64(RefObject<RowCursor> edit, long value, UpdateOptions options) {
+    public void WriteSparseInt64(Reference<RowCursor> edit, long value, UpdateOptions options) {
         int numBytes = (Long.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Int64, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1711,14 +1712,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseInt8(RefObject<RowCursor> edit, byte value, UpdateOptions options) {
+    public void WriteSparseInt8(Reference<RowCursor> edit, byte value, UpdateOptions options) {
         int numBytes = (Byte.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Int8, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1732,15 +1733,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseMongoDbObjectId(RefObject<RowCursor> edit, MongoDbObjectId value,
+    public void WriteSparseMongoDbObjectId(Reference<RowCursor> edit, MongoDbObjectId value,
                                            UpdateOptions options) {
         int numBytes = MongoDbObjectId.Size;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, MongoDbObjectId, TypeArgumentList.Empty, numBytes, options,
 			tempOut_metaBytes, tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1754,14 +1755,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseNull(RefObject<RowCursor> edit, NullValue value, UpdateOptions options) {
+    public void WriteSparseNull(Reference<RowCursor> edit, NullValue value, UpdateOptions options) {
         int numBytes = 0;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Null, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1773,16 +1774,16 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseObject(RefObject<RowCursor> edit, LayoutScope scopeType, UpdateOptions options,
-                                  OutObject<RowCursor> newScope) {
+    public void WriteSparseObject(Reference<RowCursor> edit, LayoutScope scopeType, UpdateOptions options,
+                                  Out<RowCursor> newScope) {
         int numBytes = (LayoutCode.SIZE / Byte.SIZE); // end scope type code.
         TypeArgumentList typeArgs = TypeArgumentList.Empty;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1802,17 +1803,17 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseString(RefObject<RowCursor> edit, Utf8Span value, UpdateOptions options) {
+    public void WriteSparseString(Reference<RowCursor> edit, Utf8Span value, UpdateOptions options) {
         int len = value.Length;
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: int numBytes = len + RowBuffer.Count7BitEncodedUInt((ulong)len);
         int numBytes = len + RowBuffer.Count7BitEncodedUInt(len);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.Utf8, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1825,15 +1826,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseTuple(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs
-		, UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteSparseTuple(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs
+		, UpdateOptions options, Out<RowCursor> newScope) {
         int numBytes = (LayoutCode.SIZE / Byte.SIZE) * (1 + typeArgs.getCount()); // nulls for each element.
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1869,16 +1870,16 @@ public final class RowBuffer {
         this.WriteUInt8(offset, (byte)code.getValue());
     }
 
-    public void WriteSparseUDT(RefObject<RowCursor> edit, LayoutScope scopeType, Layout udt,
-                               UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteSparseUDT(Reference<RowCursor> edit, LayoutScope scopeType, Layout udt,
+                               UpdateOptions options, Out<RowCursor> newScope) {
         TypeArgumentList typeArgs = new TypeArgumentList(udt.getSchemaId().clone());
         int numBytes = udt.getSize() + (LayoutCode.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1906,14 +1907,14 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseUInt16(ref RowCursor edit, ushort value, UpdateOptions options)
-    public void WriteSparseUInt16(RefObject<RowCursor> edit, short value, UpdateOptions options) {
+    public void WriteSparseUInt16(Reference<RowCursor> edit, short value, UpdateOptions options) {
         int numBytes = (Short.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.UInt16, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1928,14 +1929,14 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseUInt32(ref RowCursor edit, uint value, UpdateOptions options)
-    public void WriteSparseUInt32(RefObject<RowCursor> edit, int value, UpdateOptions options) {
+    public void WriteSparseUInt32(Reference<RowCursor> edit, int value, UpdateOptions options) {
         int numBytes = (Integer.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.UInt32, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1950,14 +1951,14 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseUInt64(ref RowCursor edit, ulong value, UpdateOptions options)
-    public void WriteSparseUInt64(RefObject<RowCursor> edit, long value, UpdateOptions options) {
+    public void WriteSparseUInt64(Reference<RowCursor> edit, long value, UpdateOptions options) {
         int numBytes = (Long.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.UInt64, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1972,14 +1973,14 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseUInt8(ref RowCursor edit, byte value, UpdateOptions options)
-    public void WriteSparseUInt8(RefObject<RowCursor> edit, byte value, UpdateOptions options) {
+    public void WriteSparseUInt8(Reference<RowCursor> edit, byte value, UpdateOptions options) {
         int numBytes = 1;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.UInt8, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -1992,14 +1993,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseUnixDateTime(RefObject<RowCursor> edit, UnixDateTime value, UpdateOptions options) {
+    public void WriteSparseUnixDateTime(Reference<RowCursor> edit, UnixDateTime value, UpdateOptions options) {
         int numBytes = 8;
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.UnixDateTime, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes
 			, tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2013,14 +2014,14 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteSparseVarInt(RefObject<RowCursor> edit, long value, UpdateOptions options) {
+    public void WriteSparseVarInt(Reference<RowCursor> edit, long value, UpdateOptions options) {
         int numBytes = RowBuffer.Count7BitEncodedInt(value);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.VarInt, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2036,14 +2037,14 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteSparseVarUInt(ref RowCursor edit, ulong value, UpdateOptions options)
-    public void WriteSparseVarUInt(RefObject<RowCursor> edit, long value, UpdateOptions options) {
+    public void WriteSparseVarUInt(Reference<RowCursor> edit, long value, UpdateOptions options) {
         int numBytes = RowBuffer.Count7BitEncodedUInt(value);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, LayoutType.VarUInt, TypeArgumentList.Empty, numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2064,15 +2065,15 @@ public final class RowBuffer {
         stream.Write(this.buffer.Slice(0, this.length));
     }
 
-    public void WriteTypedArray(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
-                                UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteTypedArray(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
+                                UpdateOptions options, Out<RowCursor> newScope) {
         int numBytes = (Integer.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2093,15 +2094,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteTypedMap(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
-                              UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteTypedMap(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
+                              UpdateOptions options, Out<RowCursor> newScope) {
         int numBytes = (Integer.SIZE / Byte.SIZE); // Sized scope.
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2122,15 +2123,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteTypedSet(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
-                              UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteTypedSet(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
+                              UpdateOptions options, Out<RowCursor> newScope) {
         int numBytes = (Integer.SIZE / Byte.SIZE);
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2151,15 +2152,15 @@ public final class RowBuffer {
         this.length += shift;
     }
 
-    public void WriteTypedTuple(RefObject<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
-                                UpdateOptions options, OutObject<RowCursor> newScope) {
+    public void WriteTypedTuple(Reference<RowCursor> edit, LayoutScope scopeType, TypeArgumentList typeArgs,
+                                UpdateOptions options, Out<RowCursor> newScope) {
         int numBytes = this.CountDefaultValue(scopeType, typeArgs.clone());
         int metaBytes;
-        OutObject<Integer> tempOut_metaBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_metaBytes = new Out<Integer>();
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         this.EnsureSparse(edit, scopeType, typeArgs.clone(), numBytes, options, tempOut_metaBytes,
 			tempOut_spaceNeeded, tempOut_shift);
         shift = tempOut_shift.get();
@@ -2179,40 +2180,40 @@ public final class RowBuffer {
         newScope.get().count = typeArgs.getCount();
 
         this.length += shift;
-        RefObject<RowBuffer> tempRef_this =
-			new RefObject<RowBuffer>(this);
-        RowCursorExtensions.MoveNext(newScope.get().clone(), tempRef_this);
-        this = tempRef_this.get();
+        Reference<RowBuffer> tempReference_this =
+			new Reference<RowBuffer>(this);
+        RowCursorExtensions.MoveNext(newScope.get().clone(), tempReference_this);
+        this = tempReference_this.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteUInt16(int offset, ushort value)
     public void WriteUInt16(int offset, short value) {
-        RefObject<Short> tempRef_value = new RefObject<Short>(value);
+        Reference<Short> tempReference_value = new Reference<Short>(value);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MemoryMarshal.Write(this.buffer.Slice(offset), ref value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteUInt32(int offset, uint value)
     public void WriteUInt32(int offset, int value) {
-        RefObject<Integer> tempRef_value = new RefObject<Integer>(value);
+        Reference<Integer> tempReference_value = new Reference<Integer>(value);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MemoryMarshal.Write(this.buffer.Slice(offset), ref value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteUInt64(int offset, ulong value)
     public void WriteUInt64(int offset, long value) {
-        RefObject<Long> tempRef_value = new RefObject<Long>(value);
+        Reference<Long> tempReference_value = new Reference<Long>(value);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MemoryMarshal.Write(this.buffer.Slice(offset), ref value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -2224,19 +2225,19 @@ public final class RowBuffer {
     }
 
     public void WriteUnixDateTime(int offset, UnixDateTime value) {
-        RefObject<UnixDateTime> tempRef_value =
-			new RefObject<UnixDateTime>(value);
-        MemoryMarshal.Write(this.buffer.Slice(offset), tempRef_value);
-        value = tempRef_value.get();
+        Reference<UnixDateTime> tempReference_value =
+			new Reference<UnixDateTime>(value);
+        MemoryMarshal.Write(this.buffer.Slice(offset), tempReference_value);
+        value = tempReference_value.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteVariableBinary(int offset, ReadOnlySpan<byte> value, bool exists, out int shift)
     public void WriteVariableBinary(int offset, ReadOnlySpan<Byte> value, boolean exists,
-									OutObject<Integer> shift) {
+									Out<Integer> shift) {
         int numBytes = value.Length;
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         this.EnsureVariable(offset, false, numBytes, exists, tempOut_spaceNeeded, shift);
         spaceNeeded = tempOut_spaceNeeded.get();
 
@@ -2249,10 +2250,10 @@ public final class RowBuffer {
     //ORIGINAL LINE: internal void WriteVariableBinary(int offset, ReadOnlySequence<byte> value, bool exists, out int
 	// shift)
     public void WriteVariableBinary(int offset, ReadOnlySequence<Byte> value, boolean exists,
-									OutObject<Integer> shift) {
+									Out<Integer> shift) {
         int numBytes = (int)value.Length;
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         this.EnsureVariable(offset, false, numBytes, exists, tempOut_spaceNeeded, shift);
         spaceNeeded = tempOut_spaceNeeded.get();
 
@@ -2261,10 +2262,10 @@ public final class RowBuffer {
         this.length += shift.get();
     }
 
-    public void WriteVariableInt(int offset, long value, boolean exists, OutObject<Integer> shift) {
+    public void WriteVariableInt(int offset, long value, boolean exists, Out<Integer> shift) {
         int numBytes = RowBuffer.Count7BitEncodedInt(value);
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         this.EnsureVariable(offset, true, numBytes, exists, tempOut_spaceNeeded, shift);
         spaceNeeded = tempOut_spaceNeeded.get();
 
@@ -2274,10 +2275,10 @@ public final class RowBuffer {
         this.length += shift.get();
     }
 
-    public void WriteVariableString(int offset, Utf8Span value, boolean exists, OutObject<Integer> shift) {
+    public void WriteVariableString(int offset, Utf8Span value, boolean exists, Out<Integer> shift) {
         int numBytes = value.Length;
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         this.EnsureVariable(offset, false, numBytes, exists, tempOut_spaceNeeded, shift);
         spaceNeeded = tempOut_spaceNeeded.get();
 
@@ -2288,10 +2289,10 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: internal void WriteVariableUInt(int offset, ulong value, bool exists, out int shift)
-    public void WriteVariableUInt(int offset, long value, boolean exists, OutObject<Integer> shift) {
+    public void WriteVariableUInt(int offset, long value, boolean exists, Out<Integer> shift) {
         int numBytes = RowBuffer.Count7BitEncodedUInt(value);
         int spaceNeeded;
-        OutObject<Integer> tempOut_spaceNeeded = new OutObject<Integer>();
+        Out<Integer> tempOut_spaceNeeded = new Out<Integer>();
         this.EnsureVariable(offset, true, numBytes, exists, tempOut_spaceNeeded, shift);
         spaceNeeded = tempOut_spaceNeeded.get();
 
@@ -2384,15 +2385,15 @@ public final class RowBuffer {
         leftKey.metaOffset = left.valueOffset;
         leftKey.index = 0;
 
-        RefObject<RowCursor> tempRef_leftKey =
-			new RefObject<RowCursor>(leftKey);
-        this.ReadSparseMetadata(tempRef_leftKey);
-        leftKey = tempRef_leftKey.get();
+        Reference<RowCursor> tempReference_leftKey =
+			new Reference<RowCursor>(leftKey);
+        this.ReadSparseMetadata(tempReference_leftKey);
+        leftKey = tempReference_leftKey.get();
         checkState(leftKey.pathOffset == 0);
-        RefObject<RowCursor> tempRef_leftKey2 =
-			new RefObject<RowCursor>(leftKey);
-        int leftKeyLen = this.SparseComputeSize(tempRef_leftKey2) - (leftKey.valueOffset - leftKey.metaOffset);
-        leftKey = tempRef_leftKey2.get();
+        Reference<RowCursor> tempReference_leftKey2 =
+			new Reference<RowCursor>(leftKey);
+        int leftKeyLen = this.SparseComputeSize(tempReference_leftKey2) - (leftKey.valueOffset - leftKey.metaOffset);
+        leftKey = tempReference_leftKey2.get();
 
         RowCursor rightKey = new RowCursor();
         rightKey.layout = right.layout;
@@ -2402,15 +2403,15 @@ public final class RowBuffer {
         rightKey.metaOffset = right.valueOffset;
         rightKey.index = 0;
 
-        RefObject<RowCursor> tempRef_rightKey =
-			new RefObject<RowCursor>(rightKey);
-        this.ReadSparseMetadata(tempRef_rightKey);
-        rightKey = tempRef_rightKey.get();
+        Reference<RowCursor> tempReference_rightKey =
+			new Reference<RowCursor>(rightKey);
+        this.ReadSparseMetadata(tempReference_rightKey);
+        rightKey = tempReference_rightKey.get();
         checkState(rightKey.pathOffset == 0);
-        RefObject<RowCursor> tempRef_rightKey2 =
-			new RefObject<RowCursor>(rightKey);
-        int rightKeyLen = this.SparseComputeSize(tempRef_rightKey2) - (rightKey.valueOffset - rightKey.metaOffset);
-        rightKey = tempRef_rightKey2.get();
+        Reference<RowCursor> tempReference_rightKey2 =
+			new Reference<RowCursor>(rightKey);
+        int rightKeyLen = this.SparseComputeSize(tempReference_rightKey2) - (rightKey.valueOffset - rightKey.metaOffset);
+        rightKey = tempReference_rightKey2.get();
 
         return this.CompareFieldValue(leftKey.clone(), leftKeyLen, rightKey.clone(), rightKeyLen);
     }
@@ -2420,7 +2421,7 @@ public final class RowBuffer {
      * encoding.
      *
      * @param value The value to be encoded.
-     * @return The number of bytes needed to store the varint encoding of <see cref="value" />.
+     * @return The number of bytes needed to store the varint encoding of {@link value}.
      */
     private static int Count7BitEncodedInt(long value) {
         return RowBuffer.Count7BitEncodedUInt(RowBuffer.RotateSignToLsb(value));
@@ -2630,13 +2631,13 @@ public final class RowBuffer {
         }
     }
 
-    private static int CountSparsePath(RefObject<RowCursor> edit) {
+    private static int CountSparsePath(Reference<RowCursor> edit) {
         if (!edit.get().writePathToken.getIsNull()) {
             return edit.get().writePathToken.Varint.length;
         }
 
-        OutObject<StringToken> tempOut_writePathToken =
-			new OutObject<StringToken>();
+        Out<StringToken> tempOut_writePathToken =
+			new Out<StringToken>();
         if (edit.get().layout.getTokenizer().TryFindToken(edit.get().writePath, tempOut_writePathToken)) {
             edit.get().argValue.writePathToken = tempOut_writePathToken.get();
             return edit.get().writePathToken.Varint.length;
@@ -2668,9 +2669,9 @@ public final class RowBuffer {
     //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] private void EnsureSparse(ref RowCursor edit,
 	// LayoutType cellType, TypeArgumentList typeArgs, int numBytes, UpdateOptions options, out int metaBytes, out
 	// int spaceNeeded, out int shift)
-    private void EnsureSparse(RefObject<RowCursor> edit, LayoutType cellType, TypeArgumentList typeArgs,
-                              int numBytes, UpdateOptions options, OutObject<Integer> metaBytes,
-                              OutObject<Integer> spaceNeeded, OutObject<Integer> shift) {
+    private void EnsureSparse(Reference<RowCursor> edit, LayoutType cellType, TypeArgumentList typeArgs,
+                              int numBytes, UpdateOptions options, Out<Integer> metaBytes,
+                              Out<Integer> spaceNeeded, Out<Integer> shift) {
         this.EnsureSparse(edit, cellType, typeArgs.clone(), numBytes, RowOptions.forValue(options), metaBytes,
 			spaceNeeded, shift);
     }
@@ -2691,10 +2692,10 @@ public final class RowBuffer {
      * @param shift       On success, the number of bytes the length of the row buffer was increased
      *                    (which may be negative if the row buffer was shrunk).
      */
-    private void EnsureSparse(RefObject<RowCursor> edit, LayoutType cellType, TypeArgumentList typeArgs,
-                              int numBytes, RowOptions options, OutObject<Integer> metaBytes,
-                              OutObject<Integer> spaceNeeded,
-                              OutObject<Integer> shift) {
+    private void EnsureSparse(Reference<RowCursor> edit, LayoutType cellType, TypeArgumentList typeArgs,
+                              int numBytes, RowOptions options, Out<Integer> metaBytes,
+                              Out<Integer> spaceNeeded,
+                              Out<Integer> shift) {
         int metaOffset = edit.get().metaOffset;
         int spaceAvailable = 0;
 
@@ -2759,13 +2760,13 @@ public final class RowBuffer {
     }
 
     private void EnsureVariable(int offset, boolean isVarint, int numBytes, boolean exists,
-                                OutObject<Integer> spaceNeeded, OutObject<Integer> shift) {
+                                Out<Integer> spaceNeeded, Out<Integer> shift) {
         int spaceAvailable = 0;
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ulong existingValueBytes = 0;
         long existingValueBytes = 0;
         if (exists) {
-            OutObject<Integer> tempOut_spaceAvailable = new OutObject<Integer>();
+            Out<Integer> tempOut_spaceAvailable = new Out<Integer>();
             existingValueBytes = this.Read7BitEncodedUInt(offset, tempOut_spaceAvailable);
             spaceAvailable = tempOut_spaceAvailable.get();
         }
@@ -2827,7 +2828,7 @@ public final class RowBuffer {
      * best choice.
      * </p>
      */
-    private boolean InsertionSort(RefObject<RowCursor> scope, RefObject<RowCursor> dstEdit,
+    private boolean InsertionSort(Reference<RowCursor> scope, Reference<RowCursor> dstEdit,
                                   Span<UniqueIndexItem> uniqueIndex) {
         RowCursor leftEdit = dstEdit.get().clone();
         RowCursor rightEdit = dstEdit.get().clone();
@@ -2877,7 +2878,7 @@ public final class RowBuffer {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: private ReadOnlySpan<byte> ReadBinary(int offset, out int sizeLenInBytes)
-    private ReadOnlySpan<Byte> ReadBinary(int offset, OutObject<Integer> sizeLenInBytes) {
+    private ReadOnlySpan<Byte> ReadBinary(int offset, Out<Integer> sizeLenInBytes) {
         int numBytes = (int)this.Read7BitEncodedUInt(offset, sizeLenInBytes);
         return this.buffer.Slice(offset + sizeLenInBytes.get(), numBytes);
     }
@@ -2908,7 +2909,7 @@ public final class RowBuffer {
      *             undefined.
      *             </paramref>.
      */
-    private void ReadSparseMetadata(RefObject<RowCursor> edit) {
+    private void ReadSparseMetadata(Reference<RowCursor> edit) {
         if (edit.get().scopeType.HasImplicitTypeCode(edit)) {
             edit.get().scopeType.SetImplicitTypeCode(edit);
             edit.get().valueOffset = edit.get().metaOffset;
@@ -2924,27 +2925,27 @@ public final class RowBuffer {
                 return;
             }
 
-            RefObject<RowBuffer> tempRef_this =
-				new RefObject<RowBuffer>(this);
+            Reference<RowBuffer> tempReference_this =
+				new Reference<RowBuffer>(this);
             int sizeLenInBytes;
-            OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
-            edit.get().cellTypeArgs = edit.get().cellType.ReadTypeArgumentList(tempRef_this,
+            Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
+            edit.get().cellTypeArgs = edit.get().cellType.ReadTypeArgumentList(tempReference_this,
 				edit.get().valueOffset, tempOut_sizeLenInBytes).clone();
             sizeLenInBytes = tempOut_sizeLenInBytes.get();
-            this = tempRef_this.get();
+            this = tempReference_this.get();
             edit.get().valueOffset += sizeLenInBytes;
         }
 
-        RefObject<RowBuffer> tempRef_this2 =
-			new RefObject<RowBuffer>(this);
-        edit.get().scopeType.ReadSparsePath(tempRef_this2, edit);
-        this = tempRef_this2.get();
+        Reference<RowBuffer> tempReference_this2 =
+			new Reference<RowBuffer>(this);
+        edit.get().scopeType.ReadSparsePath(tempReference_this2, edit);
+        this = tempReference_this2.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [Conditional("DEBUG")] private void ReadSparsePrimitiveTypeCode(ref RowCursor edit, LayoutType
 	// code)
-    private void ReadSparsePrimitiveTypeCode(RefObject<RowCursor> edit, LayoutType code) {
+    private void ReadSparsePrimitiveTypeCode(Reference<RowCursor> edit, LayoutType code) {
         checkState(edit.get().exists);
 
         if (edit.get().scopeType.HasImplicitTypeCode(edit)) {
@@ -2976,9 +2977,9 @@ public final class RowBuffer {
             checkState(edit.get().pathToken == 0);
         } else {
             int _;
-            OutObject<Integer> tempOut__ = new OutObject<Integer>();
+            Out<Integer> tempOut__ = new Out<Integer>();
             int pathOffset;
-            OutObject<Integer> tempOut_pathOffset = new OutObject<Integer>();
+            Out<Integer> tempOut_pathOffset = new Out<Integer>();
             int token = this.ReadSparsePathLen(edit.get().layout,
 				edit.get().metaOffset + (LayoutCode.SIZE / Byte.SIZE), tempOut__, tempOut_pathOffset);
             pathOffset = tempOut_pathOffset.get();
@@ -2988,7 +2989,7 @@ public final class RowBuffer {
         }
     }
 
-    private Utf8Span ReadString(int offset, OutObject<Integer> sizeLenInBytes) {
+    private Utf8Span ReadString(int offset, Out<Integer> sizeLenInBytes) {
         int numBytes = (int)this.Read7BitEncodedUInt(offset, sizeLenInBytes);
         return Utf8Span.UnsafeFromUtf8BytesNoValidation(this.buffer.Slice(offset + sizeLenInBytes.get(), numBytes));
     }
@@ -2999,7 +3000,7 @@ public final class RowBuffer {
      * @param edit The sparse scope to search.
      * @return The 0-based byte offset immediately following the scope end marker.
      */
-    private int SkipScope(RefObject<RowCursor> edit) {
+    private int SkipScope(Reference<RowCursor> edit) {
         while (this.SparseIteratorMoveNext(edit)) {
         }
 
@@ -3087,7 +3088,7 @@ public final class RowBuffer {
                 ///#pragma warning disable SA1137 // Elements should have the same indentation
             {
                 int sizeLenInBytes;
-                OutObject<Integer> tempOut_sizeLenInBytes = new OutObject<Integer>();
+                Out<Integer> tempOut_sizeLenInBytes = new Out<Integer>();
                 int numBytes = (int)this.Read7BitEncodedUInt(metaOffset + metaBytes, tempOut_sizeLenInBytes);
                 sizeLenInBytes = tempOut_sizeLenInBytes.get();
                 return metaBytes + sizeLenInBytes + numBytes;
@@ -3096,7 +3097,7 @@ public final class RowBuffer {
             case VarInt:
             case VarUInt: {
                 int sizeLenInBytes;
-                OutObject<Integer> tempOut_sizeLenInBytes2 = new OutObject<Integer>();
+                Out<Integer> tempOut_sizeLenInBytes2 = new Out<Integer>();
                 this.Read7BitEncodedUInt(metaOffset + metaBytes, tempOut_sizeLenInBytes2);
                 sizeLenInBytes = tempOut_sizeLenInBytes2.get();
                 return metaBytes + sizeLenInBytes;
@@ -3116,7 +3117,7 @@ public final class RowBuffer {
      * @param edit The edit structure describing the field to measure.
      * @return The length (in bytes) of the encoded field including the metadata and the value.
      */
-    private int SparseComputeSize(RefObject<RowCursor> edit) {
+    private int SparseComputeSize(Reference<RowCursor> edit) {
         if (!(edit.get().cellType instanceof LayoutScope)) {
             return this.SparseComputePrimitiveSize(edit.get().cellType, edit.get().metaOffset,
 				edit.get().valueOffset);
@@ -3124,10 +3125,10 @@ public final class RowBuffer {
 
         // Compute offset to end of value for current value.
         RowCursor newScope = this.SparseIteratorReadScope(edit, true).clone();
-		RefObject<RowCursor> tempRef_newScope =
-			new RefObject<RowCursor>(newScope);
-        int tempVar = this.SkipScope(tempRef_newScope) - edit.get().metaOffset;
-        newScope = tempRef_newScope.get();
+		Reference<RowCursor> tempReference_newScope =
+			new Reference<RowCursor>(newScope);
+        int tempVar = this.SkipScope(tempReference_newScope) - edit.get().metaOffset;
+        newScope = tempReference_newScope.get();
         return tempVar;
     }
 
@@ -3384,14 +3385,14 @@ public final class RowBuffer {
         }
     }
 
-    private void WriteSparseMetadata(RefObject<RowCursor> edit, LayoutType cellType,
+    private void WriteSparseMetadata(Reference<RowCursor> edit, LayoutType cellType,
                                      TypeArgumentList typeArgs, int metaBytes) {
         int metaOffset = edit.get().metaOffset;
         if (!edit.get().scopeType.HasImplicitTypeCode(edit)) {
-            RefObject<RowBuffer> tempRef_this =
-				new RefObject<RowBuffer>(this);
-            metaOffset += cellType.WriteTypeArgument(tempRef_this, metaOffset, typeArgs.clone());
-            this = tempRef_this.get();
+            Reference<RowBuffer> tempReference_this =
+				new Reference<RowBuffer>(this);
+            metaOffset += cellType.WriteTypeArgument(tempReference_this, metaOffset, typeArgs.clone());
+            this = tempReference_this.get();
         }
 
         this.WriteSparsePath(edit, metaOffset);
@@ -3399,7 +3400,7 @@ public final class RowBuffer {
         checkState(edit.get().valueOffset == edit.get().metaOffset + metaBytes);
     }
 
-    private void WriteSparsePath(RefObject<RowCursor> edit, int offset) {
+    private void WriteSparsePath(Reference<RowCursor> edit, int offset) {
         // Some scopes don't encode paths, therefore the cost is always zero.
         if (edit.get().scopeType.IsIndexedScope) {
             edit.get().pathToken = 0;
@@ -3408,8 +3409,8 @@ public final class RowBuffer {
         }
 
         StringToken _;
-        OutObject<StringToken> tempOut__ =
-			new OutObject<StringToken>();
+        Out<StringToken> tempOut__ =
+			new Out<StringToken>();
         checkState(!edit.get().layout.getTokenizer().TryFindToken(edit.get().writePath, tempOut__) || !edit.get().writePathToken.getIsNull());
         _ = tempOut__.get();
         if (!edit.get().writePathToken.getIsNull()) {
@@ -3437,12 +3438,12 @@ public final class RowBuffer {
     }
 
     /**
-     * <see cref="UniqueIndexItem" /> represents a single item within a set/map scope that needs
+     * {@link UniqueIndexItem} represents a single item within a set/map scope that needs
      * to be indexed.
      * <p>
      * <p>
      * This structure is used when rebuilding a set/map index during row streaming via
-     * <see cref="IO.RowWriter" />.
+     * {@link IO.RowWriter}.
      * <para />
      * Each item encodes its offsets and length within the row.
      */
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursor.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursor.java
index 0767d9c..a76de77 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursor.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursor.java
@@ -9,7 +9,8 @@ package com.azure.data.cosmos.serialization.hybridrow;
 
 // ReSharper disable InconsistentNaming
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.Layout;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutEndScope;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutScope;
@@ -30,7 +31,7 @@ public final class RowCursor {
      */
     public LayoutType cellType;
     /**
-     * For types with generic parameters (e.g. <see cref="LayoutTuple" />, the type parameters.
+     * For types with generic parameters (e.g. {@link LayoutTuple}, the type parameters.
      */
     public TypeArgumentList cellTypeArgs = new TypeArgumentList();
     /**
@@ -102,7 +103,7 @@ public final class RowCursor {
      */
     public StringToken writePathToken = new StringToken();
 
-    public static RowCursor Create(RefObject<RowBuffer> row) {
+    public static RowCursor Create(Reference<RowBuffer> row) {
         SchemaId schemaId = row.get().ReadSchemaId(1).clone();
         Layout layout = row.get().getResolver().Resolve(schemaId.clone());
         int sparseSegmentOffset = row.get().ComputeVariableValueOffset(layout, HybridRowHeader.Size,
@@ -221,7 +222,7 @@ public final class RowCursor {
     LayoutType getScopeType()
 
     /**
-     * For types with generic parameters (e.g. <see cref="LayoutTuple" />, the type parameters.
+     * For types with generic parameters (e.g. {@link LayoutTuple}, the type parameters.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [DebuggerBrowsable(DebuggerBrowsableState.Never)] public TypeArgumentList ScopeTypeArgs
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursorExtensions.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursorExtensions.java
index 78bbb8a..4ac75f7 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursorExtensions.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowCursorExtensions.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutEndScope;
 
@@ -14,7 +15,7 @@ public final class RowCursorExtensions {
     /** Makes a copy of the current cursor.
 
      The two cursors will have independent and unconnected lifetimes after cloning.  However,
-     mutations to a <see cref="RowBuffer" /> can invalidate any active cursors over the same row.
+     mutations to a {@link RowBuffer} can invalidate any active cursors over the same row.
 
      */
     // TODO: C# TO JAVA CONVERTER: 'ref return' methods are not converted by C# to Java Converter:
@@ -78,14 +79,14 @@ public final class RowCursorExtensions {
     //			edit.writePathToken = pathToken;
     //			return ref edit;
     //		}
-    public static boolean MoveNext(RefObject<RowCursor> edit, RefObject<RowBuffer> row) {
+    public static boolean MoveNext(Reference<RowCursor> edit, Reference<RowBuffer> row) {
         edit.get().writePath = null;
         edit.get().writePathToken = null;
         return row.get().SparseIteratorMoveNext(edit);
     }
 
-    public static boolean MoveNext(RefObject<RowCursor> edit, RefObject<RowBuffer> row,
-                                   RefObject<RowCursor> childScope) {
+    public static boolean MoveNext(Reference<RowCursor> edit, Reference<RowBuffer> row,
+                                   Reference<RowCursor> childScope) {
         if (childScope.get().scopeType != null) {
             RowCursorExtensions.Skip(edit.get().clone(), row, childScope);
         }
@@ -93,7 +94,7 @@ public final class RowCursorExtensions {
         return RowCursorExtensions.MoveNext(edit.get().clone(), row);
     }
 
-    public static boolean MoveTo(RefObject<RowCursor> edit, RefObject<RowBuffer> row, int index) {
+    public static boolean MoveTo(Reference<RowCursor> edit, Reference<RowBuffer> row, int index) {
         checkState(edit.get().index <= index);
         edit.get().writePath = null;
         edit.get().writePathToken = null;
@@ -106,8 +107,8 @@ public final class RowCursorExtensions {
         return true;
     }
 
-    public static void Skip(RefObject<RowCursor> edit, RefObject<RowBuffer> row,
-                            RefObject<RowCursor> childScope) {
+    public static void Skip(Reference<RowCursor> edit, Reference<RowBuffer> row,
+                            Reference<RowCursor> childScope) {
         checkArgument(childScope.get().start == edit.get().valueOffset);
         if (!(childScope.get().cellType instanceof LayoutEndScope)) {
             while (row.get().SparseIteratorMoveNext(childScope)) {
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowOptions.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowOptions.java
index 007df69..4915c0c 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowOptions.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/RowOptions.java
@@ -31,8 +31,8 @@ public enum RowOptions {
     /**
      * Update an existing value or insert a new value, if no value exists.
      * <p>
-     * If a value exists, then this operation becomes <see cref="Update" />, otherwise it
-     * becomes <see cref="Insert" />.
+     * If a value exists, then this operation becomes {@link Update}, otherwise it
+     * becomes {@link Insert}.
      */
     Upsert(3),
 
@@ -40,7 +40,7 @@ public enum RowOptions {
      * Insert a new value moving existing values to the right.
      * <p>
      * Within an array scope, inserts a new value immediately at the index moving all subsequent
-     * items to the right. In any other scope behaves the same as <see cref="Upsert" />.
+     * items to the right. In any other scope behaves the same as {@link Upsert}.
      */
     InsertAt(4),
 
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/SchemaId.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/SchemaId.java
index 45a489f..d515442 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/SchemaId.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/SchemaId.java
@@ -29,7 +29,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     private int Id;
 
     /**
-     * Initializes a new instance of the <see cref="SchemaId" /> struct.
+     * Initializes a new instance of the {@link SchemaId} struct.
      *
      * @param id The underlying globally unique identifier of the schema.
      */
@@ -45,7 +45,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     }
 
     /**
-     * <see cref="object.Equals(object)" /> overload.
+     * {@link object.Equals(object)} overload.
      */
     @Override
     public boolean equals(Object obj) {
@@ -57,7 +57,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     }
 
     /**
-     * Returns true if this is the same <see cref="SchemaId" /> as <see cref="other" />.
+     * Returns true if this is the same {@link SchemaId} as {@link other}.
      *
      * @param other The value to compare against.
      * @return True if the two values are the same.
@@ -67,7 +67,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     }
 
     /**
-     * <see cref="object.GetHashCode" /> overload.
+     * {@link object.GetHashCode} overload.
      */
     @Override
     public int hashCode() {
@@ -89,7 +89,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     }
 
     /**
-     * <see cref="object.ToString" /> overload.
+     * {@link object.ToString} overload.
      */
     @Override
     public String toString() {
@@ -97,7 +97,7 @@ public final class SchemaId implements IEquatable<SchemaId> {
     }
 
     /**
-     * Helper class for parsing <see cref="SchemaId" /> from JSON.
+     * Helper class for parsing {@link SchemaId} from JSON.
      */
     public static class SchemaIdConverter extends JsonConverter {
         @Override
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/UnixDateTime.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/UnixDateTime.java
index 01c0b49..6f6dce5 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/UnixDateTime.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/UnixDateTime.java
@@ -7,7 +7,7 @@ package com.azure.data.cosmos.serialization.hybridrow;
 /**
  * A wall clock time expressed in milliseconds since the Unix Epoch.
  * <p>
- * A <see cref="UnixDateTime" /> is a fixed length value-type providing millisecond
+ * A {@link UnixDateTime} is a fixed length value-type providing millisecond
  * granularity as a signed offset from the Unix Epoch (midnight, January 1, 1970 UTC).
  */
 // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -21,9 +21,9 @@ package com.azure.data.cosmos.serialization.hybridrow;
 public final class UnixDateTime implements IEquatable<UnixDateTime> {
     /**
      * The unix epoch.
-     * <see cref="UnixDateTime" /> values are signed values centered on <see cref="Epoch" />.
+     * {@link UnixDateTime} values are signed values centered on {@link Epoch}.
      * <para />
-     * This is the same value as default(<see cref="UnixDateTime" />).
+     * This is the same value as default({@link UnixDateTime}).
      */
     public static final UnixDateTime Epoch = new UnixDateTime();
     /**
@@ -31,15 +31,15 @@ public final class UnixDateTime implements IEquatable<UnixDateTime> {
      */
     public static final int Size = (Long.SIZE / Byte.SIZE);
     /**
-     * The number of milliseconds since <see cref="Epoch" />.
+     * The number of milliseconds since {@link Epoch}.
      * This value may be negative.
      */
     private long Milliseconds;
 
     /**
-     * Initializes a new instance of the <see cref="UnixDateTime" /> struct.
+     * Initializes a new instance of the {@link UnixDateTime} struct.
      *
-     * @param milliseconds The number of milliseconds since <see cref="Epoch" />.
+     * @param milliseconds The number of milliseconds since {@link Epoch}.
      */
     public UnixDateTime() {
     }
@@ -53,7 +53,7 @@ public final class UnixDateTime implements IEquatable<UnixDateTime> {
     }
 
     /**
-     * Returns true if this is the same value as <see cref="other" />.
+     * Returns true if this is the same value as {@link other}.
      *
      * @param other The value to compare against.
      * @return True if the two values are the same.
@@ -63,7 +63,7 @@ public final class UnixDateTime implements IEquatable<UnixDateTime> {
     }
 
     /**
-     * <see cref="object.Equals(object)" /> overload.
+     * {@link object.Equals(object)} overload.
      */
     @Override
     public boolean equals(Object obj) {
@@ -75,7 +75,7 @@ public final class UnixDateTime implements IEquatable<UnixDateTime> {
     }
 
     /**
-     * <see cref="object.GetHashCode" /> overload.
+     * {@link object.GetHashCode} overload.
      */
     @Override
     public int hashCode() {
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Murmur3Hash.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Murmur3Hash.java
new file mode 100644
index 0000000..6d90089
--- /dev/null
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Murmur3Hash.java
@@ -0,0 +1,134 @@
+//------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+package com.azure.data.cosmos.serialization.hybridrow.internal;
+
+import com.google.common.base.Utf8;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+
+import javax.annotation.Nonnull;
+import javax.annotation.concurrent.Immutable;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Strings.lenientFormat;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * Murmur3Hash for x64 (Little Endian).
+ * <p>Reference: https: //en.wikipedia.org/wiki/MurmurHash <br /></p>
+ * <p>
+ * This implementation provides span-based access for hashing content not available in a
+ * {@link T:byte[]}
+ * </p>
+ */
+@SuppressWarnings("UnstableApiUsage")
+@Immutable
+public final class Murmur3Hash {
+
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    private static final ByteBuf FALSE = Constant.add(false);
+    private static final ByteBuf TRUE = Constant.add(true);
+    private static final ByteBuf EMPTY_STRING = Constant.add("");
+
+    /**
+     * Computes a 128-bit Murmur3Hash 128-bit value for a data item
+     *
+     * @param item The data to hash
+     * @param seed The seed with which to initialize
+     * @return The 128-bit hash represented as two 64-bit words encapsulated by a {@link Code} instance
+     */
+    public static Code Hash128(@Nonnull final String item, @Nonnull final Code seed) {
+
+        checkNotNull(item, "value: null, seed: %s", seed);
+        checkNotNull(seed, "value: %s, seed: null", item);
+
+        if (item.isEmpty()) {
+            Hash128(EMPTY_STRING, seed);
+        }
+
+        final int encodedLength = Utf8.encodedLength(item);
+        ByteBuf buffer = allocator.buffer(encodedLength, encodedLength);
+
+        try {
+            final int count = buffer.writeCharSequence(item, UTF_8);
+            assert count == encodedLength : lenientFormat("count: %s, encodedLength: %s");
+            return Hash128(buffer, seed);
+        } finally {
+            buffer.release();
+        }
+    }
+
+    /**
+     * Computes a 128-bit Murmur3Hash 128-bit value for a {@link boolean} data item
+     *
+     * @param item The data to hash
+     * @param seed The seed with which to initialize
+     * @return The 128-bit hash represented as two 64-bit words encapsulated by a {@link Code} instance
+     */
+    public static Code Hash128(boolean item, Code seed) {
+        return Murmur3Hash.Hash128(item ? TRUE : FALSE, seed);
+    }
+
+    /**
+     * Computes a 128-bit Murmur3Hash 128-bit value for a {@link ByteBuf} data item
+     *
+     * @param item The data to hash
+     * @param seed The seed with which to initialize
+     * @return The 128-bit hash represented as two 64-bit words encapsulated by a {@link Code} instance
+     */
+    public static Code Hash128(ByteBuf item, Code seed) {
+        // TODO: DANOBLE: Fork and update or hack murmur3_128 to support a 128-bit seed value or push for a 32-bit seed
+        HashFunction hashFunction = Hashing.murmur3_128(Long.valueOf(seed.high | 0xFFFFFFFFL).intValue());
+        HashCode hashCode = hashFunction.hashBytes(item.array());
+        return new Code(hashCode);
+    }
+
+    @Immutable
+    public static final class Code {
+
+        public final long low, high;
+
+        public Code(long low, long high) {
+            this.low = low;
+            this.high = high;
+        }
+
+        private Code(HashCode hashCode) {
+            ByteBuf buffer = Unpooled.wrappedBuffer(hashCode.asBytes());
+            this.low = buffer.readLongLE();
+            this.high = buffer.readLongLE();
+        }
+    }
+
+    private static final class Constant {
+
+        private static ByteBuf constants = allocator.heapBuffer();
+
+        private Constant() {
+        }
+
+        static ByteBuf add(final boolean value) {
+            final int start = constants.writerIndex();
+            constants.writeByte(value ? 1 : 0);
+            return constants.slice(start, Byte.BYTES).asReadOnly();
+        }
+
+        static ByteBuf add(final String value) {
+
+            final int start = constants.writerIndex();
+            final int encodedLength = Utf8.encodedLength(value);
+            final ByteBuf buffer = allocator.buffer(encodedLength, encodedLength);
+
+            final int count = buffer.writeCharSequence(value, UTF_8);
+            assert count == encodedLength : lenientFormat("count: %s, encodedLength: %s");
+
+            return constants.slice(start, encodedLength);
+        }
+    }
+}
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/MurmurHash3.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/MurmurHash3.java
deleted file mode 100644
index eba9c5a..0000000
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/MurmurHash3.java
+++ /dev/null
@@ -1,255 +0,0 @@
-//------------------------------------------------------------
-//  Copyright (c) Microsoft Corporation.  All rights reserved.
-//------------------------------------------------------------
-
-package com.azure.data.cosmos.serialization.hybridrow.internal;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-/**
- * MurmurHash3 for x64 (Little Endian).
- * <p>Reference: https: //en.wikipedia.org/wiki/MurmurHash <br /></p>
- * <p>
- * This implementation provides span-based access for hashing content not available in a
- * <see cref="T:byte[]" />
- * </p>
- */
-public final class MurmurHash3 {
-    /** MurmurHash3 128-bit implementation.
-     @param value The data to hash.
-     @param seed The seed to initialize with.
-     @return The 128-bit hash represented as two 64-bit words.
-     */
-    // TODO: C# TO JAVA CONVERTER: Methods returning tuples are not converted by C# to Java Converter:
-    public static Value Hash128(String value, Value seed) {
-        checkArgument(value != null);
-        int size = Encoding.UTF8.GetMaxByteCount(value.length());
-        Span<byte> span = size <= 256 ? stackalloc byte[size] :new byte[size];
-        int len = Encoding.UTF8.GetBytes(value.AsSpan(), span);
-        return MurmurHash3.Hash128(span.Slice(0, len), seed);
-    }
-
-    /** MurmurHash3 128-bit implementation.
-     @param value The data to hash.
-     @param seed The seed to initialize with.
-     @return The 128-bit hash represented as two 64-bit words.
-     */
-    // TODO: C# TO JAVA CONVERTER: Methods returning tuples are not converted by C# to Java Converter:
-    public static Value Hash128(boolean value, Value seed) {
-        // Ensure that a bool is ALWAYS a single byte encoding with 1 for true and 0 for false.
-        return MurmurHash3.Hash128((byte)(value ? 1 : 0), seed);
-    }
-
-    /** MurmurHash3 128-bit implementation.
-     @param value The data to hash.
-     @param seed The seed to initialize with.
-     @return The 128-bit hash represented as two 64-bit words.
-     */
-    // TODO: C# TO JAVA CONVERTER: Methods returning tuples are not converted by C# to Java Converter:
-    //	public static unsafe(ulong low, ulong high) Hash128<T>(T value, (ulong high, ulong low) seed) where T :
-    //	unmanaged
-    //		{
-    //			ReadOnlySpan<T> span = new ReadOnlySpan<T>(&value, 1);
-    //			return MurmurHash3.Hash128(MemoryMarshal.AsBytes(span), seed);
-    //		}
-
-    /**
-     * MurmurHash3 128-bit implementation.
-     *
-     * @param span The data to hash.
-     * @param seed The seed to initialize with.
-     * @return The 128-bit hash represented as two 64-bit words.
-     */
-    // TODO: C# TO JAVA CONVERTER: Methods returning tuples are not converted by C# to Java Converter:
-    //	public static unsafe(ulong low, ulong high) Hash128(ReadOnlySpan<byte> span, (ulong high, ulong low) seed)
-    //		{
-    //			Contract.Assert(BitConverter.IsLittleEndian, "Little Endian expected");
-    //			const ulong c1 = 0x87c37b91114253d5;
-    //			const ulong c2 = 0x4cf5ad432745937f;
-    //
-    //			(ulong h1, ulong h2) = seed;
-    //
-    //			// body
-    //			unchecked
-    //			{
-    //				fixed (byte* words = span)
-    //				{
-    //					int position;
-    //					for (position = 0; position < span.Length - 15; position += 16)
-    //					{
-    //						ulong k1 = *(ulong*)(words + position);
-    //						ulong k2 = *(ulong*)(words + position + 8);
-    //
-    //						// k1, h1
-    //						k1 *= c1;
-    //						k1 = MurmurHash3.RotateLeft64(k1, 31);
-    //						k1 *= c2;
-    //
-    //						h1 ^= k1;
-    //						h1 = MurmurHash3.RotateLeft64(h1, 27);
-    //						h1 += h2;
-    //						h1 = (h1 * 5) + 0x52dce729;
-    //
-    //						// k2, h2
-    //						k2 *= c2;
-    //						k2 = MurmurHash3.RotateLeft64(k2, 33);
-    //						k2 *= c1;
-    //
-    //						h2 ^= k2;
-    //						h2 = MurmurHash3.RotateLeft64(h2, 31);
-    //						h2 += h1;
-    //						h2 = (h2 * 5) + 0x38495ab5;
-    //					}
-    //
-    //					{
-    //						// tail
-    //						ulong k1 = 0;
-    //						ulong k2 = 0;
-    //
-    //						int n = span.Length & 15;
-    //						if (n >= 15)
-    //						{
-    //							k2 ^= (ulong)words[position + 14] << 48;
-    //						}
-    //
-    //						if (n >= 14)
-    //						{
-    //							k2 ^= (ulong)words[position + 13] << 40;
-    //						}
-    //
-    //						if (n >= 13)
-    //						{
-    //							k2 ^= (ulong)words[position + 12] << 32;
-    //						}
-    //
-    //						if (n >= 12)
-    //						{
-    //							k2 ^= (ulong)words[position + 11] << 24;
-    //						}
-    //
-    //						if (n >= 11)
-    //						{
-    //							k2 ^= (ulong)words[position + 10] << 16;
-    //						}
-    //
-    //						if (n >= 10)
-    //						{
-    //							k2 ^= (ulong)words[position + 09] << 8;
-    //						}
-    //
-    //						if (n >= 9)
-    //						{
-    //							k2 ^= (ulong)words[position + 08] << 0;
-    //						}
-    //
-    //						k2 *= c2;
-    //						k2 = MurmurHash3.RotateLeft64(k2, 33);
-    //						k2 *= c1;
-    //						h2 ^= k2;
-    //
-    //						if (n >= 8)
-    //						{
-    //							k1 ^= (ulong)words[position + 7] << 56;
-    //						}
-    //
-    //						if (n >= 7)
-    //						{
-    //							k1 ^= (ulong)words[position + 6] << 48;
-    //						}
-    //
-    //						if (n >= 6)
-    //						{
-    //							k1 ^= (ulong)words[position + 5] << 40;
-    //						}
-    //
-    //						if (n >= 5)
-    //						{
-    //							k1 ^= (ulong)words[position + 4] << 32;
-    //						}
-    //
-    //						if (n >= 4)
-    //						{
-    //							k1 ^= (ulong)words[position + 3] << 24;
-    //						}
-    //
-    //						if (n >= 3)
-    //						{
-    //							k1 ^= (ulong)words[position + 2] << 16;
-    //						}
-    //
-    //						if (n >= 2)
-    //						{
-    //							k1 ^= (ulong)words[position + 1] << 8;
-    //						}
-    //
-    //						if (n >= 1)
-    //						{
-    //							k1 ^= (ulong)words[position + 0] << 0;
-    //						}
-    //
-    //						k1 *= c1;
-    //						k1 = MurmurHash3.RotateLeft64(k1, 31);
-    //						k1 *= c2;
-    //						h1 ^= k1;
-    //					}
-    //				}
-    //
-    //				// finalization
-    //				h1 ^= (ulong)span.Length;
-    //				h2 ^= (ulong)span.Length;
-    //				h1 += h2;
-    //				h2 += h1;
-    //				h1 = MurmurHash3.Mix(h1);
-    //				h2 = MurmurHash3.Mix(h2);
-    //				h1 += h2;
-    //				h2 += h1;
-    //			}
-    //
-    //			return (h1, h2);
-    //		}
-
-    // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
-    //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong Mix(ulong h)
-    //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong Mix(ulong h)
-    private static long Mix(long h) {
-        // TODO: C# TO JAVA CONVERTER: There is no equivalent to an 'unchecked' block in Java:
-        //C# TO JAVA CONVERTER WARNING: The right shift operator was replaced by Java's logical right shift
-        // operator since the left operand was originally of an unsigned type, but you should confirm this
-        // replacement:
-        h ^= h >>> 33;
-        h *= 0xff51afd7ed558ccdL;
-        //C# TO JAVA CONVERTER WARNING: The right shift operator was replaced by Java's logical right shift
-        // operator since the left operand was originally of an unsigned type, but you should confirm this
-        // replacement:
-        h ^= h >>> 33;
-        h *= 0xc4ceb9fe1a85ec53L;
-        //C# TO JAVA CONVERTER WARNING: The right shift operator was replaced by Java's logical right shift
-        // operator since the left operand was originally of an unsigned type, but you should confirm this replacement:
-        h ^= h >>> 33;
-        return h;
-    }
-
-    // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
-    //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong RotateLeft64(ulong n,
-    // int numBits)
-    //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong RotateLeft64(ulong n,
-    // int numBits)
-    private static long RotateLeft64(long n, int numBits) {
-        checkArgument(numBits < 64, "numBits < 64");
-        //C# TO JAVA CONVERTER WARNING: The right shift operator was replaced by Java's logical right shift operator
-        // since the left operand was originally of an unsigned type, but you should confirm this replacement:
-        return (n << numBits) | (n >>> (64 - numBits));
-    }
-
-    public static final class Value {
-
-        public final long low, high;
-
-        public Value(long low, long high) {
-            this.low = low;
-            this.high = high;
-        }
-    }
-}
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Utf8StringJsonConverter.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Utf8StringJsonConverter.java
deleted file mode 100644
index 02823f4..0000000
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/internal/Utf8StringJsonConverter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-//------------------------------------------------------------
-//  Copyright (c) Microsoft Corporation.  All rights reserved.
-//------------------------------------------------------------
-
-package com.azure.data.cosmos.serialization.hybridrow.internal;
-
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import io.netty.buffer.ByteBuf;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-/**
- * Helper class for parsing <see cref="Utf8String" /> from JSON.
- */
-public class Utf8StringJsonConverter extends StdSerializer<ByteBuf> {
-
-    public Utf8StringJsonConverter() {
-        this(ByteBuf.class);
-    }
-
-    public Utf8StringJsonConverter(Class<ByteBuf> type) {
-        super(type);
-    }
-
-    @Override
-    public boolean canWrite() {
-        return true;
-    }
-
-    @Override
-    public boolean CanConvert(Class<?> type) {
-        return type.isAssignableFrom(ByteBuf);
-    }
-
-    @Override
-    public Object ReadJson(
-        JsonReader reader, java.lang.Class objectType, Object existingValue, JsonSerializer serializer) {
-        checkArgument(reader.TokenType == JsonToken.String);
-        return Utf8String.TranscodeUtf16((String)reader.Value);
-    }
-
-    @Override
-    public void WriteJson(JsonWriter writer, Object value, JsonSerializer serializer) {
-        writer.WriteValue(((Utf8String)value).toString());
-    }
-}
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/IRowSerializable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/IRowSerializable.java
index 217dfb3..be99639 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/IRowSerializable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/IRowSerializable.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.io;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.TypeArgument;
 
@@ -19,5 +20,5 @@ public interface IRowSerializable {
      * @param typeArg The schematized layout type, if a schema is available.
      * @return Success if the write is successful, the error code otherwise.
      */
-    Result write(RefObject<RowWriter> writer, TypeArgument typeArg);
+    Result write(Reference<RowWriter> writer, TypeArgument typeArg);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReader.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReader.java
index ab4bcf8..bf8e172 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReader.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReader.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.io;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -55,21 +56,22 @@ import static com.google.common.base.Preconditions.checkState;
 
 
 /**
- * A forward-only, streaming, field reader for <see cref="RowBuffer" />.
+ * A forward-only, streaming, field reader for {@link RowBuffer}.
  * <p>
- * A <see cref="RowReader" /> allows the traversal in a streaming, left to right fashion, of
+ * A {@link RowReader} allows the traversal in a streaming, left to right fashion, of
  * an entire HybridRow. The row's layout provides decoding for any schematized portion of the row.
  * However, unschematized sparse fields are read directly from the sparse segment with or without
  * schematization allowing all fields within the row, both known and unknown, to be read.
  * <para />
- * Modifying a <see cref="RowBuffer" /> invalidates any reader or child reader associated with it.  In
- * general <see cref="RowBuffer" />'s should not be mutated while being enumerated.
+ * Modifying a {@link RowBuffer} invalidates any reader or child reader associated with it.  In
+ * general {@link RowBuffer}'s should not be mutated while being enumerated.
  */
 //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may differ
 // from the original:
 //ORIGINAL LINE: public ref struct RowReader
 //C# TO JAVA CONVERTER WARNING: Java has no equivalent to the C# ref struct:
 public final class RowReader {
+
     private int columnIndex;
     private ReadOnlySpan<LayoutColumn> columns;
     private RowCursor cursor = new RowCursor();
@@ -79,35 +81,35 @@ public final class RowReader {
     private States state = States.values()[0];
 
     /**
-     * Initializes a new instance of the <see cref="RowReader" /> struct.
+     * Initializes a new instance of the {@link RowReader} struct.
      *
      * @param row   The row to be read.
      * @param scope The scope whose fields should be enumerated.
      *              <p>
-     *              A <see cref="RowReader" /> instance traverses all of the top-level fields of a given
+     *              A {@link RowReader} instance traverses all of the top-level fields of a given
      *              scope.  If the root scope is provided then all top-level fields in the row are enumerated.  Nested
-     *              child <see cref="RowReader" /> instances can be access through the <see cref="ReadScope" /> method
+     *              child {@link RowReader} instances can be access through the {@link ReadScope} method
      *              to process nested content.
      */
     public RowReader() {
     }
 
     /**
-     * Initializes a new instance of the <see cref="RowReader" /> struct.
+     * Initializes a new instance of the {@link RowReader} struct.
      *
      * @param row   The row to be read.
      * @param scope The scope whose fields should be enumerated.
      *              <p>
-     *              A <see cref="RowReader" /> instance traverses all of the top-level fields of a given
+     *              A {@link RowReader} instance traverses all of the top-level fields of a given
      *              scope.  If the root scope is provided then all top-level fields in the row are enumerated.  Nested
-     *              child <see cref="RowReader" /> instances can be access through the <see cref="ReadScope" /> method
+     *              child {@link RowReader} instances can be access through the {@link ReadScope} method
      *              to process nested content.
      */
-    public RowReader(RefObject<RowBuffer> row) {
+    public RowReader(Reference<RowBuffer> row) {
         this(row, RowCursor.Create(row));
     }
 
-    public RowReader(RefObject<RowBuffer> row, final Checkpoint checkpoint) {
+    public RowReader(Reference<RowBuffer> row, final Checkpoint checkpoint) {
         this.row = row.get().clone();
         this.columns = checkpoint.Cursor.layout.getColumns();
         this.schematizedCount = checkpoint.Cursor.layout.getNumFixed() + checkpoint.Cursor.layout.getNumVariable();
@@ -117,7 +119,7 @@ public final class RowReader {
         this.columnIndex = checkpoint.ColumnIndex;
     }
 
-    private RowReader(RefObject<RowBuffer> row, final RowCursor scope) {
+    private RowReader(Reference<RowBuffer> row, final RowCursor scope) {
         this.cursor = scope.clone();
         this.row = row.get().clone();
         this.columns = this.cursor.layout.getColumns();
@@ -140,16 +142,16 @@ public final class RowReader {
                 return true;
             case Sparse:
                 if (this.cursor.cellType instanceof LayoutNullable) {
-                    RefObject<RowCursor> tempRef_cursor =
-                        new RefObject<RowCursor>(this.cursor);
-                    RowCursor nullableScope = this.row.SparseIteratorReadScope(tempRef_cursor, true).clone();
-                    this.cursor = tempRef_cursor.get();
-                    RefObject<RowBuffer> tempRef_row =
-                        new RefObject<RowBuffer>(this.row);
-                    RefObject<RowCursor> tempRef_nullableScope = new RefObject<RowCursor>(nullableScope);
-                    boolean tempVar = LayoutNullable.HasValue(tempRef_row, tempRef_nullableScope) == Result.Success;
-                    nullableScope = tempRef_nullableScope.get();
-                    this.row = tempRef_row.get();
+                    Reference<RowCursor> tempReference_cursor =
+                        new Reference<RowCursor>(this.cursor);
+                    RowCursor nullableScope = this.row.SparseIteratorReadScope(tempReference_cursor, true).clone();
+                    this.cursor = tempReference_cursor.get();
+                    Reference<RowBuffer> tempReference_row =
+                        new Reference<RowBuffer>(this.row);
+                    Reference<RowCursor> tempReference_nullableScope = new Reference<RowCursor>(nullableScope);
+                    boolean tempVar = LayoutNullable.HasValue(tempReference_row, tempReference_nullableScope) == Result.Success;
+                    nullableScope = tempReference_nullableScope.get();
+                    this.row = tempReference_row.get();
                     return tempVar;
                 }
 
@@ -163,7 +165,7 @@ public final class RowReader {
      * The 0-based index, relative to the start of the scope, of the field (if positioned on a
      * field, undefined otherwise).
      * <p>
-     * When enumerating a non-indexed scope, this value is always 0 (see <see cref="Path" />).
+     * When enumerating a non-indexed scope, this value is always 0 (see {@link Path}).
      */
     public int getIndex() {
         switch (this.state) {
@@ -187,7 +189,7 @@ public final class RowReader {
      * The path, relative to the scope, of the field (if positioned on a field, undefined
      * otherwise).
      * <p>
-     * When enumerating an indexed scope, this value is always null (see <see cref="Index" />).
+     * When enumerating an indexed scope, this value is always null (see {@link Index}).
      */
     public UtfAnyString getPath() {
         switch (this.state) {
@@ -198,10 +200,10 @@ public final class RowReader {
                     return null;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                Utf8Span span = this.row.ReadSparsePath(tempRef_cursor);
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                Utf8Span span = this.row.ReadSparsePath(tempReference_cursor);
+                this.cursor = tempReference_cursor.get();
                 return Utf8String.CopyFrom(span);
             default:
                 return null;
@@ -212,17 +214,17 @@ public final class RowReader {
      * The path, relative to the scope, of the field (if positioned on a field, undefined
      * otherwise).
      * <p>
-     * When enumerating an indexed scope, this value is always null (see <see cref="Index" />).
+     * When enumerating an indexed scope, this value is always null (see {@link Index}).
      */
     public Utf8Span getPathSpan() {
         switch (this.state) {
             case Schematized:
                 return this.columns[this.columnIndex].Path.Span;
             case Sparse:
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                Utf8Span tempVar = this.row.ReadSparsePath(tempRef_cursor);
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                Utf8Span tempVar = this.row.ReadSparsePath(tempReference_cursor);
+                this.cursor = tempReference_cursor.get();
                 return tempVar;
             default:
                 return null;
@@ -314,16 +316,16 @@ public final class RowReader {
 
             case Sparse: {
 
-                RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
+                Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
 
                 if (!RowCursorExtensions.MoveNext(this.cursor.clone(),
-                    tempRef_row)) {
-                    this.row = tempRef_row.get();
+                    tempReference_row)) {
+                    this.row = tempReference_row.get();
                     this.state = States.Done;
                     // TODO: C# TO JAVA CONVERTER: There is no 'goto' in Java:
                     //   goto case States.Done;
                 } else {
-                    this.row = tempRef_row.get();
+                    this.row = tempReference_row.get();
                 }
 
                 return true;
@@ -345,10 +347,10 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadBinary(out byte[] value)
-    public Result ReadBinary(OutObject<byte[]> value) {
+    public Result ReadBinary(Out<byte[]> value) {
         ReadOnlySpan<Byte> span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Result r = this.ReadBinary(out ReadOnlySpan<byte> span);
         Result r = this.ReadBinary(out span);
@@ -365,7 +367,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadBinary(out ReadOnlySpan<byte> value)
-    public Result ReadBinary(OutObject<ReadOnlySpan<Byte>> value) {
+    public Result ReadBinary(Out<ReadOnlySpan<Byte>> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -375,10 +377,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseBinary(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseBinary(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -387,12 +389,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a <see cref="bool" />.
+     * Read the current field as a {@link bool}.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadBool(OutObject<Boolean> value) {
+    public Result ReadBool(Out<Boolean> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -402,10 +404,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseBool(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseBool(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(false);
@@ -414,12 +416,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a fixed length <see cref="DateTime" /> value.
+     * Read the current field as a fixed length {@link DateTime} value.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadDateTime(OutObject<LocalDateTime> value) {
+    public Result ReadDateTime(Out<LocalDateTime> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -429,10 +431,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseDateTime(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseDateTime(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(LocalDateTime.MIN);
@@ -441,12 +443,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a fixed length <see cref="decimal" /> value.
+     * Read the current field as a fixed length {@link decimal} value.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadDecimal(OutObject<BigDecimal> value) {
+    public Result ReadDecimal(Out<BigDecimal> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -456,10 +458,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseDecimal(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseDecimal(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(new BigDecimal(0));
@@ -473,7 +475,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadFloat128(OutObject<Float128> value) {
+    public Result ReadFloat128(Out<Float128> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value.clone());
@@ -483,10 +485,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseFloat128(tempRef_cursor).clone());
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseFloat128(tempReference_cursor).clone());
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -500,7 +502,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadFloat32(OutObject<Float> value) {
+    public Result ReadFloat32(Out<Float> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -510,10 +512,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseFloat32(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseFloat32(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -527,7 +529,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadFloat64(OutObject<Double> value) {
+    public Result ReadFloat64(Out<Double> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -537,10 +539,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseFloat64(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseFloat64(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -549,12 +551,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a fixed length <see cref="Guid" /> value.
+     * Read the current field as a fixed length {@link Guid} value.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadGuid(OutObject<UUID> value) {
+    public Result ReadGuid(Out<UUID> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -564,10 +566,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseGuid(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseGuid(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -581,7 +583,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadInt16(OutObject<Short> value) {
+    public Result ReadInt16(Out<Short> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -591,10 +593,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseInt16(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseInt16(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -608,7 +610,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadInt32(OutObject<Integer> value) {
+    public Result ReadInt32(Out<Integer> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -618,10 +620,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseInt32(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseInt32(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -635,7 +637,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadInt64(OutObject<Long> value) {
+    public Result ReadInt64(Out<Long> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -645,10 +647,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseInt64(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseInt64(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -662,7 +664,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadInt8(OutObject<Byte> value) {
+    public Result ReadInt8(Out<Byte> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -672,10 +674,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseInt8(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseInt8(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -684,12 +686,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a fixed length <see cref="MongoDbObjectId" /> value.
+     * Read the current field as a fixed length {@link MongoDbObjectId} value.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadMongoDbObjectId(OutObject<MongoDbObjectId> value) {
+    public Result ReadMongoDbObjectId(Out<MongoDbObjectId> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value.clone());
@@ -699,10 +701,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseMongoDbObjectId(tempRef_cursor).clone());
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseMongoDbObjectId(tempReference_cursor).clone());
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -716,7 +718,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadNull(OutObject<NullValue> value) {
+    public Result ReadNull(Out<NullValue> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value.clone());
@@ -726,10 +728,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseNull(tempRef_cursor).clone());
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseNull(tempReference_cursor).clone());
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -746,15 +748,15 @@ public final class RowReader {
      * Nested child readers are independent of their parent.
      */
     public RowReader ReadScope() {
-        RefObject<RowCursor> tempRef_cursor =
-            new RefObject<RowCursor>(this.cursor);
-        RowCursor newScope = this.row.SparseIteratorReadScope(tempRef_cursor, true).clone();
-        this.cursor = tempRef_cursor.get();
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_cursor =
+            new Reference<RowCursor>(this.cursor);
+        RowCursor newScope = this.row.SparseIteratorReadScope(tempReference_cursor, true).clone();
+        this.cursor = tempReference_cursor.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         return new RowReader(ref this.row, newScope)
-        this.row = tempRef_row.get();
+        this.row = tempReference_row.get();
         return tempVar;
     }
 
@@ -765,32 +767,32 @@ public final class RowReader {
      * objects, arrays, tuples, set, and maps.
      */
     public <TContext> Result ReadScope(TContext context, ReaderFunc<TContext> func) {
-        RefObject<RowCursor> tempRef_cursor =
-            new RefObject<RowCursor>(this.cursor);
-        RowCursor childScope = this.row.SparseIteratorReadScope(tempRef_cursor, true).clone();
-        this.cursor = tempRef_cursor.get();
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
-        RowReader nestedReader = new RowReader(tempRef_row, childScope.clone());
-        this.row = tempRef_row.get();
+        Reference<RowCursor> tempReference_cursor =
+            new Reference<RowCursor>(this.cursor);
+        RowCursor childScope = this.row.SparseIteratorReadScope(tempReference_cursor, true).clone();
+        this.cursor = tempReference_cursor.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
+        RowReader nestedReader = new RowReader(tempReference_row, childScope.clone());
+        this.row = tempReference_row.get();
 
-        RefObject<RowReader> tempRef_nestedReader =
-            new RefObject<RowReader>(nestedReader);
+        Reference<RowReader> tempReference_nestedReader =
+            new Reference<RowReader>(nestedReader);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         Result result = func == null ? null : func.Invoke(ref nestedReader, context) ??Result.Success;
-        nestedReader = tempRef_nestedReader.get();
+        nestedReader = tempReference_nestedReader.get();
         if (result != Result.Success) {
             return result;
         }
 
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_cursor2 =
-            new RefObject<RowCursor>(nestedReader.cursor);
-        RowCursorExtensions.Skip(this.cursor.clone(), tempRef_row2,
-            tempRef_cursor2);
-        nestedReader.cursor = tempRef_cursor2.get();
-        this.row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_cursor2 =
+            new Reference<RowCursor>(nestedReader.cursor);
+        RowCursorExtensions.Skip(this.cursor.clone(), tempReference_row2,
+            tempReference_cursor2);
+        nestedReader.cursor = tempReference_cursor2.get();
+        this.row = tempReference_row2.get();
         return Result.Success;
     }
 
@@ -800,10 +802,10 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadString(OutObject<String> value) {
+    public Result ReadString(Out<String> value) {
         Utf8Span span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.ReadString(out span);
         value.set((r == Result.Success) ? span.toString() :)
         default
@@ -816,10 +818,10 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadString(OutObject<Utf8String> value) {
+    public Result ReadString(Out<Utf8String> value) {
         Utf8Span span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.ReadString(out span);
         value.set((r == Result.Success) ? Utf8String.CopyFrom(span) :)
         default
@@ -832,7 +834,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadString(OutObject<Utf8Span> value) {
+    public Result ReadString(Out<Utf8Span> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -842,10 +844,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseString(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseString(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -861,7 +863,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadUInt16(out ushort value)
-    public Result ReadUInt16(OutObject<Short> value) {
+    public Result ReadUInt16(Out<Short> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -871,10 +873,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseUInt16(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseUInt16(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -890,7 +892,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadUInt32(out uint value)
-    public Result ReadUInt32(OutObject<Integer> value) {
+    public Result ReadUInt32(Out<Integer> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -900,10 +902,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseUInt32(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseUInt32(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -919,7 +921,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadUInt64(out ulong value)
-    public Result ReadUInt64(OutObject<Long> value) {
+    public Result ReadUInt64(Out<Long> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -929,10 +931,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseUInt64(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseUInt64(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -948,7 +950,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadUInt8(out byte value)
-    public Result ReadUInt8(OutObject<Byte> value) {
+    public Result ReadUInt8(Out<Byte> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -958,10 +960,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseUInt8(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseUInt8(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -970,12 +972,12 @@ public final class RowReader {
     }
 
     /**
-     * Read the current field as a fixed length <see cref="UnixDateTime" /> value.
+     * Read the current field as a fixed length {@link UnixDateTime} value.
      *
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadUnixDateTime(OutObject<UnixDateTime> value) {
+    public Result ReadUnixDateTime(Out<UnixDateTime> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value.clone());
@@ -985,10 +987,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseUnixDateTime(tempRef_cursor).clone());
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseUnixDateTime(tempReference_cursor).clone());
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(null);
@@ -1002,7 +1004,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    public Result ReadVarInt(OutObject<Long> value) {
+    public Result ReadVarInt(Out<Long> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -1012,10 +1014,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseVarInt(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseVarInt(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -1031,7 +1033,7 @@ public final class RowReader {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadVarUInt(out ulong value)
-    public Result ReadVarUInt(OutObject<Long> value) {
+    public Result ReadVarUInt(Out<Long> value) {
         switch (this.state) {
             case Schematized:
                 return this.ReadPrimitiveValue(value);
@@ -1041,10 +1043,10 @@ public final class RowReader {
                     return Result.TypeMismatch;
                 }
 
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                value.set(this.row.ReadSparseVarUInt(tempRef_cursor));
-                this.cursor = tempRef_cursor.get();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                value.set(this.row.ReadSparseVarUInt(tempReference_cursor));
+                this.cursor = tempReference_cursor.get();
                 return Result.Success;
             default:
                 value.set(0);
@@ -1062,22 +1064,22 @@ public final class RowReader {
      * <p>
      * <p>
      * The reader must not have been advanced since the child reader was created with ReadScope.
-     * This method can be used when the overload of <see cref="ReadScope" /> that takes a
-     * <see cref="ReaderFunc{TContext}" /> is not an option, such as when TContext is a ref struct.
+     * This method can be used when the overload of {@link ReadScope} that takes a
+     * {@link ReaderFunc{TContext}} is not an option, such as when TContext is a ref struct.
      */
-    public Result SkipScope(RefObject<RowReader> nestedReader) {
+    public Result SkipScope(Reference<RowReader> nestedReader) {
         if (nestedReader.get().cursor.start != this.cursor.valueOffset) {
             return Result.Failure;
         }
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_cursor =
-            new RefObject<RowCursor>(nestedReader.get().cursor);
-        RowCursorExtensions.Skip(this.cursor.clone(), tempRef_row,
-            tempRef_cursor);
-        nestedReader.get().argValue.cursor = tempRef_cursor.get();
-        this.row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_cursor =
+            new Reference<RowCursor>(nestedReader.get().cursor);
+        RowCursorExtensions.Skip(this.cursor.clone(), tempReference_row,
+            tempReference_cursor);
+        nestedReader.get().argValue.cursor = tempReference_cursor.get();
+        this.row = tempReference_row.get();
         return Result.Success;
     }
 
@@ -1101,7 +1103,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    private <TValue> Result ReadPrimitiveValue(OutObject<TValue> value) {
+    private <TValue> Result ReadPrimitiveValue(Out<TValue> value) {
         LayoutColumn col = this.columns[this.columnIndex];
         LayoutType t = this.columns[this.columnIndex].Type;
         if (!(t instanceof LayoutType<TValue>)) {
@@ -1111,20 +1113,20 @@ public final class RowReader {
 
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_row =
-                    new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<LayoutType<TValue>>TypeAs().ReadFixed(tempRef_row, tempRef_cursor, col, value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                Reference<RowBuffer> tempReference_row =
+                    new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<LayoutType<TValue>>TypeAs().ReadFixed(tempReference_row, tempReference_cursor, col, value);
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case Variable:
-                RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 = new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<LayoutType<TValue>>TypeAs().ReadVariable(tempRef_row2, tempRef_cursor2, col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 = new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<LayoutType<TValue>>TypeAs().ReadVariable(tempReference_row2, tempReference_cursor2, col, value);
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 throw new IllegalStateException();
@@ -1139,7 +1141,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    private Result ReadPrimitiveValue(OutObject<Utf8Span> value) {
+    private Result ReadPrimitiveValue(Out<Utf8Span> value) {
         LayoutColumn col = this.columns[this.columnIndex];
         LayoutType t = this.columns[this.columnIndex].Type;
         if (!(t instanceof ILayoutUtf8SpanReadable)) {
@@ -1149,18 +1151,19 @@ public final class RowReader {
 
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor = new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<ILayoutUtf8SpanReadable>TypeAs().ReadFixed(tempRef_row, tempRef_cursor, col, value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor = new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<ILayoutUtf8SpanReadable>TypeAs().ReadFixed(tempReference_row, tempReference_cursor, col, value);
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case Variable:
-                RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 = new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<ILayoutUtf8SpanReadable>TypeAs().ReadVariable(tempRef_row2, tempRef_cursor2, col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 = new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<ILayoutUtf8SpanReadable>TypeAs().ReadVariable(tempReference_row2,
+                    tempReference_cursor2, col, value);
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 throw new IllegalStateException();
@@ -1176,7 +1179,7 @@ public final class RowReader {
      * @param value On success, receives the value, undefined otherwise.
      * @return Success if the read is successful, an error code otherwise.
      */
-    private <TElement> Result ReadPrimitiveValue(OutObject<ReadOnlySpan<TElement>> value) {
+    private <TElement> Result ReadPrimitiveValue(Out<ReadOnlySpan<TElement>> value) {
         LayoutColumn col = this.columns[this.columnIndex];
         LayoutType t = this.columns[this.columnIndex].Type;
         if (!(t instanceof ILayoutSpanReadable<TElement>)) {
@@ -1186,18 +1189,18 @@ public final class RowReader {
 
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor = new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<ILayoutSpanReadable<TElement>>TypeAs().ReadFixed(tempRef_row, tempRef_cursor, col, value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor = new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<ILayoutSpanReadable<TElement>>TypeAs().ReadFixed(tempReference_row, tempReference_cursor, col, value);
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case Variable:
-                RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 = new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<ILayoutSpanReadable<TElement>>TypeAs().ReadVariable(tempRef_row2, tempRef_cursor2, col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 = new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<ILayoutSpanReadable<TElement>>TypeAs().ReadVariable(tempReference_row2, tempReference_cursor2, col, value);
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 throw new IllegalStateException();
@@ -1244,7 +1247,7 @@ public final class RowReader {
     }
 
     /**
-     * A function to reader content from a <see cref="RowBuffer" />.
+     * A function to reader content from a {@link RowBuffer}.
      * <typeparam name="TContext">The type of the context value passed by the caller.</typeparam>
      *
      * @param reader  A forward-only cursor for writing content.
@@ -1253,12 +1256,12 @@ public final class RowReader {
      */
     @FunctionalInterface
     public interface ReaderFunc<TContext> {
-        Result invoke(RefObject<RowReader> reader, TContext context);
+        Result invoke(Reference<RowReader> reader, TContext context);
     }
 
     /**
-     * An encapsulation of the current state of a <see cref="RowReader" /> that can be used to
-     * recreate the <see cref="RowReader" /> in the same logical position.
+     * An encapsulation of the current state of a {@link RowReader} that can be used to
+     * recreate the {@link RowReader} in the same logical position.
      */
     //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may differ from the original:
     //ORIGINAL LINE: public readonly struct Checkpoint
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReaderExtensions.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReaderExtensions.java
index 87be9cf..08c91ff 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReaderExtensions.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReaderExtensions.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.io;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 
 import java.util.ArrayList;
@@ -21,13 +22,13 @@ public final class RowReaderExtensions {
      * @param list         On success, the collection of materialized items.
      * @return The result.
      */
-    public static <TItem> Result ReadList(RefObject<RowReader> reader, DeserializerFunc<TItem> deserializer,
-                                          OutObject<ArrayList<TItem>> list) {
+    public static <TItem> Result ReadList(Reference<RowReader> reader, DeserializerFunc<TItem> deserializer,
+                                          Out<ArrayList<TItem>> list) {
         // Pass the context as a struct by value to avoid allocations.
         ListContext<TItem> ctx = new ListContext<TItem>();
         ctx.List = new ArrayList<>();
         ctx.Deserializer =
-            (RefObject<RowReader> reader.argValue, OutObject<TItem> item) -> deserializer.invoke(reader.get().clone(), item);
+            (Reference<RowReader> reader.argValue, Out<TItem> item) -> deserializer.invoke(reader.get().clone(), item);
 
         // All lambda's here are static.
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
@@ -37,12 +38,12 @@ public final class RowReaderExtensions {
             while (arrayReader.Read()) {
                 Result r2 = arrayReader.ReadScope(ctx1.clone(), (ref RowReader itemReader, ListContext<TItem> ctx2) ->
                 {
-                    RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowReader> tempRef_itemReader = new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowReader>(itemReader);
+                    Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowReader> tempReference_itemReader = new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowReader>(itemReader);
                     TItem op;
-                    OutObject<TItem> tempOut_op = new OutObject<TItem>();
-                    Result r3 = ctx2.Deserializer.invoke(tempRef_itemReader, tempOut_op);
+                    Out<TItem> tempOut_op = new Out<TItem>();
+                    Result r3 = ctx2.Deserializer.invoke(tempReference_itemReader, tempOut_op);
                     op = tempOut_op.get();
-                    itemReader = tempRef_itemReader.get();
+                    itemReader = tempReference_itemReader.get();
                     if (r3 != Result.Success) {
                         return r3;
                     }
@@ -69,7 +70,7 @@ public final class RowReaderExtensions {
     }
 
     /**
-     * A function to read content from a <see cref="RowReader" />.
+     * A function to read content from a {@link RowReader}.
      * <typeparam name="TItem">The type of the item to read.</typeparam>
      *
      * @param reader A forward-only cursor for reading the item.
@@ -78,7 +79,7 @@ public final class RowReaderExtensions {
      */
     @FunctionalInterface
     public interface DeserializerFunc<TItem> {
-        Result invoke(RefObject<RowReader> reader, OutObject<TItem> item);
+        Result invoke(Reference<RowReader> reader, Out<TItem> item);
     }
 
     //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowWriter.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowWriter.java
index f32e935..14902dd 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowWriter.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowWriter.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.io;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -33,19 +34,19 @@ public final class RowWriter {
     private RowBuffer row = new RowBuffer();
 
     /**
-     * Initializes a new instance of the <see cref="RowWriter" /> struct.
+     * Initializes a new instance of the {@link RowWriter} struct.
      *
      * @param row   The row to be read.
      * @param scope The scope into which items should be written.
      *              <p>
-     *              A <see cref="RowWriter" /> instance writes the fields of a given scope from left to right
+     *              A {@link RowWriter} instance writes the fields of a given scope from left to right
      *              in a forward only manner. If the root scope is provided then all top-level fields in the row can be
      *              written.
      */
     public RowWriter() {
     }
 
-    private RowWriter(RefObject<RowBuffer> row, RefObject<RowCursor> scope) {
+    private RowWriter(Reference<RowBuffer> row, Reference<RowCursor> scope) {
         this.row = row.get().clone();
         this.cursor = scope.get().clone();
     }
@@ -84,7 +85,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.Binary, (ref RowWriter w, byte[] v) => w
         // .row.WriteSparseBinary(ref w.cursor, v, UpdateOptions.Upsert));
@@ -105,7 +106,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.Binary, (ref RowWriter w,
         // ReadOnlySpan<byte> v) => w.row.WriteSparseBinary(ref w.cursor, v, UpdateOptions.Upsert));
@@ -126,7 +127,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.Binary, (ref RowWriter w,
         // ReadOnlySequence<byte> v) => w.row.WriteSparseBinary(ref w.cursor, v, UpdateOptions.Upsert));
@@ -136,7 +137,7 @@ public final class RowWriter {
     }
 
     /**
-     * Write a field as a <see cref="bool" />.
+     * Write a field as a {@link bool}.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -146,7 +147,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Boolean,
             (ref RowWriter w, boolean v) -> w.row.WriteSparseBool(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -160,26 +161,26 @@ public final class RowWriter {
      * @param func    A function to write the entire row.
      * @return Success if the write is successful, an error code otherwise.
      */
-    public static <TContext> Result WriteBuffer(RefObject<RowBuffer> row, TContext context,
+    public static <TContext> Result WriteBuffer(Reference<RowBuffer> row, TContext context,
                                                 WriterFunc<TContext> func) {
         RowCursor scope = RowCursor.Create(row);
-        RefObject<RowCursor> tempRef_scope =
-            new RefObject<RowCursor>(scope);
-        RowWriter writer = new RowWriter(row, tempRef_scope);
-        scope = tempRef_scope.get();
+        Reference<RowCursor> tempReference_scope =
+            new Reference<RowCursor>(scope);
+        RowWriter writer = new RowWriter(row, tempReference_scope);
+        scope = tempReference_scope.get();
         TypeArgument typeArg = new TypeArgument(LayoutType.UDT,
             new TypeArgumentList(scope.layout.getSchemaId().clone()));
-        RefObject<RowWriter> tempRef_writer =
-            new RefObject<RowWriter>(writer);
+        Reference<RowWriter> tempReference_writer =
+            new Reference<RowWriter>(writer);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         Result result = func(ref writer, typeArg, context);
-        writer = tempRef_writer.get();
+        writer = tempReference_writer.get();
         row.set(writer.row.clone());
         return result;
     }
 
     /**
-     * Write a field as a fixed length <see cref="DateTime" /> value.
+     * Write a field as a fixed length {@link DateTime} value.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -189,13 +190,13 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.DateTime,
             (ref RowWriter w, LocalDateTime v) -> w.row.WriteSparseDateTime(ref w.cursor, v, UpdateOptions.Upsert));
     }
 
     /**
-     * Write a field as a fixed length <see cref="decimal" /> value.
+     * Write a field as a fixed length {@link decimal} value.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -205,7 +206,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Decimal,
             (ref RowWriter w, BigDecimal v) -> w.row.WriteSparseDecimal(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -221,7 +222,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value.clone(), LayoutType.Float128,
             (ref RowWriter w, Float128 v) -> w.row.WriteSparseFloat128(ref w.cursor, v.clone(), UpdateOptions.Upsert));
     }
@@ -237,7 +238,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Float32,
             (ref RowWriter w, float v) -> w.row.WriteSparseFloat32(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -253,13 +254,13 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Float64,
             (ref RowWriter w, double v) -> w.row.WriteSparseFloat64(ref w.cursor, v, UpdateOptions.Upsert));
     }
 
     /**
-     * Write a field as a fixed length <see cref="Guid" /> value.
+     * Write a field as a fixed length {@link Guid} value.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -269,7 +270,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Guid,
             (ref RowWriter w, UUID v) -> w.row.WriteSparseGuid(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -285,7 +286,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Int16,
             (ref RowWriter w, short v) -> w.row.WriteSparseInt16(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -301,7 +302,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Int32,
             (ref RowWriter w, int v) -> w.row.WriteSparseInt32(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -317,7 +318,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Int64,
             (ref RowWriter w, long v) -> w.row.WriteSparseInt64(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -333,13 +334,13 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Int8,
             (ref RowWriter w, byte v) -> w.row.WriteSparseInt8(ref w.cursor, v, UpdateOptions.Upsert));
     }
 
     /**
-     * Write a field as a fixed length <see cref="MongoDbObjectId" /> value.
+     * Write a field as a fixed length {@link MongoDbObjectId} value.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -349,13 +350,13 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value.clone(), LayoutType.MongoDbObjectId, (ref RowWriter w,
                                                                                      MongoDbObjectId v) -> w.row.WriteSparseMongoDbObjectId(ref w.cursor, v.clone(), UpdateOptions.Upsert));
     }
 
     /**
-     * Write a field as a <see cref="t:null"/>.
+     * Write a field as a {@link t:null}.
      *
      * @param path The scope-relative path of the field to write.
      * @return Success if the write is successful, an error code otherwise.
@@ -364,7 +365,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, NullValue.Default, LayoutType.Null,
             (ref RowWriter w, NullValue v) -> w.row.WriteSparseNull(ref w.cursor, v.clone(), UpdateOptions.Upsert));
     }
@@ -383,10 +384,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutObject scopeType:
             case LayoutObject
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope =
+                    new Out<RowCursor>();
                 this.row.WriteSparseObject(tempRef_cursor, scopeType, UpdateOptions.Upsert, tempOut_nestedScope);
                 nestedScope = tempOut_nestedScope.get();
                 this.cursor = tempRef_cursor.argValue;
@@ -395,10 +396,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutArray scopeType:
             case LayoutArray
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor2 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope2 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor2 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope2 =
+                    new Out<RowCursor>();
                 this.row.WriteSparseArray(tempRef_cursor2, scopeType, UpdateOptions.Upsert, tempOut_nestedScope2);
                 nestedScope = tempOut_nestedScope2.get();
                 this.cursor = tempRef_cursor2.argValue;
@@ -407,10 +408,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTypedArray scopeType:
             case LayoutTypedArray
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor3 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope3 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor3 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope3 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedArray(tempRef_cursor3, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope3);
                 nestedScope = tempOut_nestedScope3.get();
@@ -421,10 +422,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTuple scopeType:
             case LayoutTuple
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor4 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope4 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor4 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope4 =
+                    new Out<RowCursor>();
                 this.row.WriteSparseTuple(tempRef_cursor4, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope4);
                 nestedScope = tempOut_nestedScope4.get();
@@ -435,10 +436,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTypedTuple scopeType:
             case LayoutTypedTuple
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor5 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope5 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor5 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope5 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedTuple(tempRef_cursor5, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope5);
                 nestedScope = tempOut_nestedScope5.get();
@@ -449,10 +450,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTagged scopeType:
             case LayoutTagged
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor6 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope6 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor6 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope6 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedTuple(tempRef_cursor6, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope6);
                 nestedScope = tempOut_nestedScope6.get();
@@ -463,10 +464,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTagged2 scopeType:
             case LayoutTagged2
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor7 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope7 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor7 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope7 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedTuple(tempRef_cursor7, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope7);
                 nestedScope = tempOut_nestedScope7.get();
@@ -477,10 +478,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutNullable scopeType:
             case LayoutNullable
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor8 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope8 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor8 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope8 =
+                    new Out<RowCursor>();
                 this.row.WriteNullable(tempRef_cursor8, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, func != null, tempOut_nestedScope8);
                 nestedScope = tempOut_nestedScope8.get();
@@ -492,23 +493,23 @@ public final class RowWriter {
             case LayoutUDT
                 scopeType:
                 Layout udt = this.row.getResolver().Resolve(typeArg.getTypeArgs().getSchemaId().clone());
-                RefObject<RowCursor> tempRef_cursor9 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope9 =
-                    new OutObject<RowCursor>();
-                this.row.WriteSparseUDT(tempRef_cursor9, scopeType, udt, UpdateOptions.Upsert, tempOut_nestedScope9);
+                Reference<RowCursor> tempReference_cursor9 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope9 =
+                    new Out<RowCursor>();
+                this.row.WriteSparseUDT(tempReference_cursor9, scopeType, udt, UpdateOptions.Upsert, tempOut_nestedScope9);
                 nestedScope = tempOut_nestedScope9.get();
-                this.cursor = tempRef_cursor9.get();
+                this.cursor = tempReference_cursor9.get();
                 break;
 
             // TODO: C# TO JAVA CONVERTER: Java has no equivalent to C# pattern variables in 'case' statements:
             //ORIGINAL LINE: case LayoutTypedSet scopeType:
             case LayoutTypedSet
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor10 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope10 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor10 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope10 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedSet(tempRef_cursor10, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope10);
                 nestedScope = tempOut_nestedScope10.get();
@@ -519,10 +520,10 @@ public final class RowWriter {
             //ORIGINAL LINE: case LayoutTypedMap scopeType:
             case LayoutTypedMap
                 scopeType:
-                RefObject<RowCursor> tempRef_cursor11 =
-                    new RefObject<RowCursor>(this.cursor);
-                OutObject<RowCursor> tempOut_nestedScope11 =
-                    new OutObject<RowCursor>();
+                Reference<RowCursor> tempReference_cursor11 =
+                    new Reference<RowCursor>(this.cursor);
+                Out<RowCursor> tempOut_nestedScope11 =
+                    new Out<RowCursor>();
                 this.row.WriteTypedMap(tempRef_cursor11, scopeType, typeArg.getTypeArgs().clone(),
                     UpdateOptions.Upsert, tempOut_nestedScope11);
                 nestedScope = tempOut_nestedScope11.get();
@@ -534,18 +535,18 @@ public final class RowWriter {
                 return Result.Failure;
         }
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_nestedScope =
-            new RefObject<RowCursor>(nestedScope);
-        RowWriter nestedWriter = new RowWriter(tempRef_row, tempRef_nestedScope);
-        nestedScope = tempRef_nestedScope.get();
-        this.row = tempRef_row.get();
-        RefObject<RowWriter> tempRef_nestedWriter =
-            new RefObject<RowWriter>(nestedWriter);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_nestedScope =
+            new Reference<RowCursor>(nestedScope);
+        RowWriter nestedWriter = new RowWriter(tempReference_row, tempReference_nestedScope);
+        nestedScope = tempReference_nestedScope.get();
+        this.row = tempReference_row.get();
+        Reference<RowWriter> tempReference_nestedWriter =
+            new Reference<RowWriter>(nestedWriter);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         result = func == null ? null : func.Invoke(ref nestedWriter, typeArg, context) ??Result.Success;
-        nestedWriter = tempRef_nestedWriter.get();
+        nestedWriter = tempReference_nestedWriter.get();
         this.row = nestedWriter.row.clone();
         nestedScope.count = nestedWriter.cursor.count;
 
@@ -555,24 +556,24 @@ public final class RowWriter {
         }
 
         if (type instanceof LayoutUniqueScope) {
-            RefObject<RowCursor> tempRef_nestedScope2 =
-                new RefObject<RowCursor>(nestedScope);
-            result = this.row.TypedCollectionUniqueIndexRebuild(tempRef_nestedScope2);
-            nestedScope = tempRef_nestedScope2.get();
+            Reference<RowCursor> tempReference_nestedScope2 =
+                new Reference<RowCursor>(nestedScope);
+            result = this.row.TypedCollectionUniqueIndexRebuild(tempReference_nestedScope2);
+            nestedScope = tempReference_nestedScope2.get();
             if (result != Result.Success) {
                 // TODO: If the index rebuild fails then the row is corrupted.  Should we automatically clean up here?
                 return result;
             }
         }
 
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_cursor12 =
-            new RefObject<RowCursor>(nestedWriter.cursor);
-        RowCursorExtensions.MoveNext(this.cursor.clone(), tempRef_row2
-            , tempRef_cursor12);
-        nestedWriter.cursor = tempRef_cursor12.get();
-        this.row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_cursor12 =
+            new Reference<RowCursor>(nestedWriter.cursor);
+        RowCursorExtensions.MoveNext(this.cursor.clone(), tempReference_row2
+            , tempReference_cursor12);
+        nestedWriter.cursor = tempReference_cursor12.get();
+        this.row = tempReference_row2.get();
         return Result.Success;
     }
 
@@ -587,7 +588,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Utf8,
             (ref RowWriter w, String v) -> w.row.WriteSparseString(ref w.cursor, Utf8Span.TranscodeUtf16(v),
                 UpdateOptions.Upsert));
@@ -604,7 +605,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.Utf8,
             (ref RowWriter w, Utf8Span v) -> w.row.WriteSparseString(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -622,7 +623,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.UInt16, (ref RowWriter w, ushort v) => w
         // .row.WriteSparseUInt16(ref w.cursor, v, UpdateOptions.Upsert));
@@ -643,7 +644,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.UInt32, (ref RowWriter w, uint v) => w
         // .row.WriteSparseUInt32(ref w.cursor, v, UpdateOptions.Upsert));
@@ -664,7 +665,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.UInt64, (ref RowWriter w, ulong v) => w
         // .row.WriteSparseUInt64(ref w.cursor, v, UpdateOptions.Upsert));
@@ -685,7 +686,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.UInt8, (ref RowWriter w, byte v) => w.row
         // .WriteSparseUInt8(ref w.cursor, v, UpdateOptions.Upsert));
@@ -694,7 +695,7 @@ public final class RowWriter {
     }
 
     /**
-     * Write a field as a fixed length <see cref="UnixDateTime" /> value.
+     * Write a field as a fixed length {@link UnixDateTime} value.
      *
      * @param path  The scope-relative path of the field to write.
      * @param value The value to write.
@@ -704,7 +705,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value.clone(), LayoutType.UnixDateTime,
             (ref RowWriter w, UnixDateTime v) -> w.row.WriteSparseUnixDateTime(ref w.cursor, v.clone(),
                 UpdateOptions.Upsert));
@@ -721,7 +722,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         return this.WritePrimitive(path, value, LayoutType.VarInt,
             (ref RowWriter w, long v) -> w.row.WriteSparseVarInt(ref w.cursor, v, UpdateOptions.Upsert));
     }
@@ -739,7 +740,7 @@ public final class RowWriter {
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: return this.WritePrimitive(path, value, LayoutType.VarUInt, (ref RowWriter w, ulong v) => w
         // .row.WriteSparseVarUInt(ref w.cursor, v, UpdateOptions.Upsert));
@@ -769,13 +770,13 @@ public final class RowWriter {
                 return Result.TypeConstraint;
             }
         } else if (this.cursor.scopeType instanceof LayoutTypedMap) {
-            RefObject<RowCursor> tempRef_cursor =
-                new RefObject<RowCursor>(this.cursor);
-            if (!typeArg.equals(this.cursor.scopeType.<LayoutUniqueScope>TypeAs().FieldType(tempRef_cursor).clone())) {
-                this.cursor = tempRef_cursor.get();
+            Reference<RowCursor> tempReference_cursor =
+                new Reference<RowCursor>(this.cursor);
+            if (!typeArg.equals(this.cursor.scopeType.<LayoutUniqueScope>TypeAs().FieldType(tempReference_cursor).clone())) {
+                this.cursor = tempReference_cursor.get();
                 return Result.TypeConstraint;
             } else {
-                this.cursor = tempRef_cursor.get();
+                this.cursor = tempReference_cursor.get();
             }
         } else if (this.cursor.scopeType.IsTypedScope && !typeArg.equals(this.cursor.scopeTypeArgs.get(0).clone())) {
             return Result.TypeConstraint;
@@ -792,7 +793,7 @@ public final class RowWriter {
      * @param path   The scope-relative path of the field to write.
      * @param value  The value to write.
      * @param type   The layout type.
-     * @param sparse The <see cref="RowBuffer" /> access method for <paramref name="type" />.
+     * @param sparse The {@link RowBuffer} access method for <paramref name="type" />.
      * @return Success if the write is successful, an error code otherwise.
      */
     private <TLayoutType extends LayoutType<String> & ILayoutUtf8SpanWritable> Result WritePrimitive(UtfAnyString path, Utf8Span value, TLayoutType type, AccessUtf8SpanMethod sparse) {
@@ -808,16 +809,16 @@ public final class RowWriter {
                 return result;
             }
 
-            RefObject<RowWriter> tempRef_this =
-                new RefObject<RowWriter>(this);
+            Reference<RowWriter> tempReference_this =
+                new Reference<RowWriter>(this);
             // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
             sparse(ref this, value)
-            this = tempRef_this.get();
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(this.row);
+            this = tempReference_this.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(this.row);
             RowCursorExtensions.MoveNext(this.cursor.clone(),
-                tempRef_row);
-            this.row = tempRef_row.get();
+                tempReference_row);
+            this.row = tempReference_row.get();
         }
 
         return result;
@@ -831,7 +832,7 @@ public final class RowWriter {
      * @param path   The scope-relative path of the field to write.
      * @param value  The value to write.
      * @param type   The layout type.
-     * @param sparse The <see cref="RowBuffer" /> access method for <paramref name="type" />.
+     * @param sparse The {@link RowBuffer} access method for <paramref name="type" />.
      * @return Success if the write is successful, an error code otherwise.
      */
     private <TLayoutType extends LayoutType<TElement[]> & ILayoutSpanWritable<TElement>, TElement> Result WritePrimitive(UtfAnyString path, ReadOnlySpan<TElement> value, TLayoutType type, AccessReadOnlySpanMethod<TElement> sparse) {
@@ -847,16 +848,16 @@ public final class RowWriter {
                 return result;
             }
 
-            RefObject<RowWriter> tempRef_this =
-                new RefObject<RowWriter>(this);
+            Reference<RowWriter> tempReference_this =
+                new Reference<RowWriter>(this);
             // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
             sparse(ref this, value)
-            this = tempRef_this.get();
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(this.row);
+            this = tempReference_this.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(this.row);
             RowCursorExtensions.MoveNext(this.cursor.clone(),
-                tempRef_row);
-            this.row = tempRef_row.get();
+                tempReference_row);
+            this.row = tempReference_row.get();
         }
 
         return result;
@@ -870,7 +871,7 @@ public final class RowWriter {
      * @param path   The scope-relative path of the field to write.
      * @param value  The value to write.
      * @param type   The layout type.
-     * @param sparse The <see cref="RowBuffer" /> access method for <paramref name="type" />.
+     * @param sparse The {@link RowBuffer} access method for <paramref name="type" />.
      * @return Success if the write is successful, an error code otherwise.
      */
     private <TLayoutType extends LayoutType<TElement[]> & ILayoutSequenceWritable<TElement>, TElement> Result WritePrimitive(UtfAnyString path, ReadOnlySequence<TElement> value, TLayoutType type, AccessMethod<ReadOnlySequence<TElement>> sparse) {
@@ -886,16 +887,16 @@ public final class RowWriter {
                 return result;
             }
 
-            RefObject<RowWriter> tempRef_this =
-                new RefObject<RowWriter>(this);
+            Reference<RowWriter> tempReference_this =
+                new Reference<RowWriter>(this);
             // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
             sparse(ref this, value)
-            this = tempRef_this.get();
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(this.row);
+            this = tempReference_this.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(this.row);
             RowCursorExtensions.MoveNext(this.cursor.clone(),
-                tempRef_row);
-            this.row = tempRef_row.get();
+                tempReference_row);
+            this.row = tempReference_row.get();
         }
 
         return result;
@@ -908,7 +909,7 @@ public final class RowWriter {
      * @param path   The scope-relative path of the field to write.
      * @param value  The value to write.
      * @param type   The layout type.
-     * @param sparse The <see cref="RowBuffer" /> access method for <paramref name="type" />.
+     * @param sparse The {@link RowBuffer} access method for <paramref name="type" />.
      * @return Success if the write is successful, an error code otherwise.
      */
     private <TValue> Result WritePrimitive(UtfAnyString path, TValue value, LayoutType<TValue> type,
@@ -926,16 +927,16 @@ public final class RowWriter {
                 return result;
             }
 
-            RefObject<RowWriter> tempRef_this =
-                new RefObject<RowWriter>(this);
+            Reference<RowWriter> tempReference_this =
+                new Reference<RowWriter>(this);
             // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
             sparse(ref this, value)
-            this = tempRef_this.get();
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(this.row);
+            this = tempReference_this.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(this.row);
             RowCursorExtensions.MoveNext(this.cursor.clone(),
-                tempRef_row);
-            this.row = tempRef_row.get();
+                tempReference_row);
+            this.row = tempReference_row.get();
         }
 
         return result;
@@ -952,7 +953,7 @@ public final class RowWriter {
     private <TValue> Result WriteSchematizedValue(UtfAnyString path, TValue value) {
         LayoutColumn col;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (!this.cursor.layout.TryFind(path, out col)) {
             return Result.NotFound;
         }
@@ -965,17 +966,17 @@ public final class RowWriter {
 
         switch (col.Storage) {
             case StorageKind.Fixed:
-                RefObject<RowBuffer> tempRef_row =
-                    new RefObject<RowBuffer>(this.row);
+                Reference<RowBuffer> tempReference_row =
+                    new Reference<RowBuffer>(this.row);
                 Result tempVar2 = t.WriteFixed(ref this.row, ref this.cursor, col, value)
-                this.row = tempRef_row.get();
+                this.row = tempReference_row.get();
                 return tempVar2;
 
             case StorageKind.Variable:
-                RefObject<RowBuffer> tempRef_row2 =
-                    new RefObject<RowBuffer>(this.row);
+                Reference<RowBuffer> tempReference_row2 =
+                    new Reference<RowBuffer>(this.row);
                 Result tempVar3 = t.WriteVariable(ref this.row, ref this.cursor, col, value)
-                this.row = tempRef_row2.get();
+                this.row = tempReference_row2.get();
                 return tempVar3;
 
             default:
@@ -995,7 +996,7 @@ public final class RowWriter {
     private Result WriteSchematizedValue(UtfAnyString path, Utf8Span value) {
         LayoutColumn col;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (!this.cursor.layout.TryFind(path, out col)) {
             return Result.NotFound;
         }
@@ -1007,24 +1008,25 @@ public final class RowWriter {
 
         switch (col.Storage) {
             case StorageKind.Fixed:
-                RefObject<RowBuffer> tempRef_row =
-                    new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor =
-                    new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<ILayoutUtf8SpanWritable>TypeAs().WriteFixed(tempRef_row, tempRef_cursor, col,
+                Reference<RowBuffer> tempReference_row =
+                    new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor =
+                    new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<ILayoutUtf8SpanWritable>TypeAs().WriteFixed(tempReference_row, tempReference_cursor, col,
                     value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case StorageKind.Variable:
-                RefObject<RowBuffer> tempRef_row2 =
-                    new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 =
-                    new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<ILayoutUtf8SpanWritable>TypeAs().WriteVariable(tempRef_row2, tempRef_cursor2,
+                Reference<RowBuffer> tempReference_row2 =
+                    new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 =
+                    new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<ILayoutUtf8SpanWritable>TypeAs().WriteVariable(tempReference_row2,
+                    tempReference_cursor2,
                     col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 return Result.NotFound;
@@ -1041,7 +1043,7 @@ public final class RowWriter {
      */
     private <TElement> Result WriteSchematizedValue(UtfAnyString path, ReadOnlySpan<TElement> value) {
         LayoutColumn col;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (!this.cursor.layout.TryFind(path, out col)) {
             return Result.NotFound;
         }
@@ -1053,18 +1055,18 @@ public final class RowWriter {
 
         switch (col.Storage) {
             case StorageKind.Fixed:
-                RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor = new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<ILayoutSpanWritable<TElement>>TypeAs().WriteFixed(tempRef_row, tempRef_cursor, col, value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor = new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<ILayoutSpanWritable<TElement>>TypeAs().WriteFixed(tempReference_row, tempReference_cursor, col, value);
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case StorageKind.Variable:
-                RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 = new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<ILayoutSpanWritable<TElement>>TypeAs().WriteVariable(tempRef_row2, tempRef_cursor2, col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 = new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<ILayoutSpanWritable<TElement>>TypeAs().WriteVariable(tempReference_row2, tempReference_cursor2, col, value);
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 return Result.NotFound;
@@ -1081,7 +1083,7 @@ public final class RowWriter {
      */
     private <TElement> Result WriteSchematizedValue(UtfAnyString path, ReadOnlySequence<TElement> value) {
         LayoutColumn col;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (!this.cursor.layout.TryFind(path, out col)) {
             return Result.NotFound;
         }
@@ -1093,18 +1095,18 @@ public final class RowWriter {
 
         switch (col.Storage) {
             case StorageKind.Fixed:
-                RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor = new RefObject<RowCursor>(this.cursor);
-                Result tempVar = t.<ILayoutSequenceWritable<TElement>>TypeAs().WriteFixed(tempRef_row, tempRef_cursor, col, value);
-                this.cursor = tempRef_cursor.get();
-                this.row = tempRef_row.get();
+                Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor = new Reference<RowCursor>(this.cursor);
+                Result tempVar = t.<ILayoutSequenceWritable<TElement>>TypeAs().WriteFixed(tempReference_row, tempReference_cursor, col, value);
+                this.cursor = tempReference_cursor.get();
+                this.row = tempReference_row.get();
                 return tempVar;
             case StorageKind.Variable:
-                RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(this.row);
-                RefObject<RowCursor> tempRef_cursor2 = new RefObject<RowCursor>(this.cursor);
-                Result tempVar2 = t.<ILayoutSequenceWritable<TElement>>TypeAs().WriteVariable(tempRef_row2, tempRef_cursor2, col, value);
-                this.cursor = tempRef_cursor2.get();
-                this.row = tempRef_row2.get();
+                Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(this.row);
+                Reference<RowCursor> tempReference_cursor2 = new Reference<RowCursor>(this.cursor);
+                Result tempVar2 = t.<ILayoutSequenceWritable<TElement>>TypeAs().WriteVariable(tempReference_row2, tempReference_cursor2, col, value);
+                this.cursor = tempReference_cursor2.get();
+                this.row = tempReference_row2.get();
                 return tempVar2;
             default:
                 return Result.NotFound;
@@ -1113,21 +1115,21 @@ public final class RowWriter {
 
     @FunctionalInterface
     private interface AccessMethod<TValue> {
-        void invoke(RefObject<RowWriter> writer, TValue value);
+        void invoke(Reference<RowWriter> writer, TValue value);
     }
 
     @FunctionalInterface
     private interface AccessReadOnlySpanMethod<T> {
-        void invoke(RefObject<RowWriter> writer, ReadOnlySpan value);
+        void invoke(Reference<RowWriter> writer, ReadOnlySpan value);
     }
 
     @FunctionalInterface
     private interface AccessUtf8SpanMethod {
-        void invoke(RefObject<RowWriter> writer, Utf8Span value);
+        void invoke(Reference<RowWriter> writer, Utf8Span value);
     }
 
     /**
-     * A function to write content into a <see cref="RowBuffer" />.
+     * A function to write content into a {@link RowBuffer}.
      * <typeparam name="TContext">The type of the context value passed by the caller.</typeparam>
      *
      * @param writer  A forward-only cursor for writing content.
@@ -1137,6 +1139,6 @@ public final class RowWriter {
      */
     @FunctionalInterface
     public interface WriterFunc<TContext> {
-        Result invoke(RefObject<RowWriter> writer, TypeArgument typeArg, TContext context);
+        Result invoke(Reference<RowWriter> writer, TypeArgument typeArg, TContext context);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonExtensions.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonExtensions.java
index b966239..eaee737 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonExtensions.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonExtensions.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.json;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -16,26 +17,26 @@ import java.util.UUID;
 
 public final class RowReaderJsonExtensions {
     /**
-     * Project a JSON document from a HybridRow <see cref="RowReader"/>.
+     * Project a JSON document from a HybridRow {@link RowReader}.
      *
      * @param reader The reader to project to JSON.
      * @param str    If successful, the JSON document that corresponds to the <paramref name="reader"/>.
      * @return The result.
      */
-    public static Result ToJson(RefObject<RowReader> reader, OutObject<String> str) {
+    public static Result ToJson(Reference<RowReader> reader, Out<String> str) {
         return RowReaderJsonExtensions.ToJson(reader.get().clone(), new RowReaderJsonSettings("  "), str);
     }
 
     /**
-     * Project a JSON document from a HybridRow <see cref="RowReader"/>.
+     * Project a JSON document from a HybridRow {@link RowReader}.
      *
      * @param reader   The reader to project to JSON.
      * @param settings Settings that control how the JSON document is formatted.
      * @param str      If successful, the JSON document that corresponds to the <paramref name="reader"/>.
      * @return The result.
      */
-    public static Result ToJson(RefObject<RowReader> reader, RowReaderJsonSettings settings,
-                                OutObject<String> str) {
+    public static Result ToJson(Reference<RowReader> reader, RowReaderJsonSettings settings,
+                                Out<String> str) {
         ReaderStringContext ctx = new ReaderStringContext(new StringBuilder(),
             new RowReaderJsonSettings(settings.IndentChars, settings.QuoteChar == '\'' ? '\'' : '"'), 1);
 
@@ -52,7 +53,7 @@ public final class RowReaderJsonExtensions {
         return Result.Success;
     }
 
-    private static Result ToJson(RefObject<RowReader> reader, ReaderStringContext ctx) {
+    private static Result ToJson(Reference<RowReader> reader, ReaderStringContext ctx) {
         int index = 0;
         while (reader.get().Read()) {
             String path = !reader.get().getPath().IsNull ? String.format("%1$s%2$s%3$s:", ctx.Settings.QuoteChar,
@@ -75,8 +76,8 @@ public final class RowReaderJsonExtensions {
             switch (reader.get().getType().LayoutCode) {
                 case Null: {
                     NullValue _;
-                    OutObject<NullValue> tempOut__ =
-                        new OutObject<NullValue>();
+                    Out<NullValue> tempOut__ =
+                        new Out<NullValue>();
                     r = reader.get().ReadNull(tempOut__);
                     _ = tempOut__.get();
                     if (r != Result.Success) {
@@ -89,7 +90,7 @@ public final class RowReaderJsonExtensions {
 
                 case Boolean: {
                     boolean value;
-                    OutObject<Boolean> tempOut_value = new OutObject<Boolean>();
+                    Out<Boolean> tempOut_value = new Out<Boolean>();
                     r = reader.get().ReadBool(tempOut_value);
                     value = tempOut_value.get();
                     if (r != Result.Success) {
@@ -102,7 +103,7 @@ public final class RowReaderJsonExtensions {
 
                 case Int8: {
                     byte value;
-                    OutObject<Byte> tempOut_value2 = new OutObject<Byte>();
+                    Out<Byte> tempOut_value2 = new Out<Byte>();
                     r = reader.get().ReadInt8(tempOut_value2);
                     value = tempOut_value2.get();
                     if (r != Result.Success) {
@@ -115,7 +116,7 @@ public final class RowReaderJsonExtensions {
 
                 case Int16: {
                     short value;
-                    OutObject<Short> tempOut_value3 = new OutObject<Short>();
+                    Out<Short> tempOut_value3 = new Out<Short>();
                     r = reader.get().ReadInt16(tempOut_value3);
                     value = tempOut_value3.get();
                     if (r != Result.Success) {
@@ -128,7 +129,7 @@ public final class RowReaderJsonExtensions {
 
                 case Int32: {
                     int value;
-                    OutObject<Integer> tempOut_value4 = new OutObject<Integer>();
+                    Out<Integer> tempOut_value4 = new Out<Integer>();
                     r = reader.get().ReadInt32(tempOut_value4);
                     value = tempOut_value4.get();
                     if (r != Result.Success) {
@@ -141,7 +142,7 @@ public final class RowReaderJsonExtensions {
 
                 case Int64: {
                     long value;
-                    OutObject<Long> tempOut_value5 = new OutObject<Long>();
+                    Out<Long> tempOut_value5 = new Out<Long>();
                     r = reader.get().ReadInt64(tempOut_value5);
                     value = tempOut_value5.get();
                     if (r != Result.Success) {
@@ -154,7 +155,7 @@ public final class RowReaderJsonExtensions {
 
                 case UInt8: {
                     byte value;
-                    OutObject<Byte> tempOut_value6 = new OutObject<Byte>();
+                    Out<Byte> tempOut_value6 = new Out<Byte>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadUInt8(out byte value);
                     r = reader.get().ReadUInt8(tempOut_value6);
@@ -169,7 +170,7 @@ public final class RowReaderJsonExtensions {
 
                 case UInt16: {
                     short value;
-                    OutObject<Short> tempOut_value7 = new OutObject<Short>();
+                    Out<Short> tempOut_value7 = new Out<Short>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadUInt16(out ushort value);
                     r = reader.get().ReadUInt16(tempOut_value7);
@@ -184,7 +185,7 @@ public final class RowReaderJsonExtensions {
 
                 case UInt32: {
                     int value;
-                    OutObject<Integer> tempOut_value8 = new OutObject<Integer>();
+                    Out<Integer> tempOut_value8 = new Out<Integer>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadUInt32(out uint value);
                     r = reader.get().ReadUInt32(tempOut_value8);
@@ -199,7 +200,7 @@ public final class RowReaderJsonExtensions {
 
                 case UInt64: {
                     long value;
-                    OutObject<Long> tempOut_value9 = new OutObject<Long>();
+                    Out<Long> tempOut_value9 = new Out<Long>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadUInt64(out ulong value);
                     r = reader.get().ReadUInt64(tempOut_value9);
@@ -214,7 +215,7 @@ public final class RowReaderJsonExtensions {
 
                 case VarInt: {
                     long value;
-                    OutObject<Long> tempOut_value10 = new OutObject<Long>();
+                    Out<Long> tempOut_value10 = new Out<Long>();
                     r = reader.get().ReadVarInt(tempOut_value10);
                     value = tempOut_value10.get();
                     if (r != Result.Success) {
@@ -227,7 +228,7 @@ public final class RowReaderJsonExtensions {
 
                 case VarUInt: {
                     long value;
-                    OutObject<Long> tempOut_value11 = new OutObject<Long>();
+                    Out<Long> tempOut_value11 = new Out<Long>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadVarUInt(out ulong value);
                     r = reader.get().ReadVarUInt(tempOut_value11);
@@ -242,7 +243,7 @@ public final class RowReaderJsonExtensions {
 
                 case Float32: {
                     float value;
-                    OutObject<Float> tempOut_value12 = new OutObject<Float>();
+                    Out<Float> tempOut_value12 = new Out<Float>();
                     r = reader.get().ReadFloat32(tempOut_value12);
                     value = tempOut_value12.get();
                     if (r != Result.Success) {
@@ -255,7 +256,7 @@ public final class RowReaderJsonExtensions {
 
                 case Float64: {
                     double value;
-                    OutObject<Double> tempOut_value13 = new OutObject<Double>();
+                    Out<Double> tempOut_value13 = new Out<Double>();
                     r = reader.get().ReadFloat64(tempOut_value13);
                     value = tempOut_value13.get();
                     if (r != Result.Success) {
@@ -268,8 +269,8 @@ public final class RowReaderJsonExtensions {
 
                 case Float128: {
                     Float128 _;
-                    OutObject<Float128> tempOut__2 =
-                        new OutObject<Float128>();
+                    Out<Float128> tempOut__2 =
+                        new Out<Float128>();
                     r = reader.get().ReadFloat128(tempOut__2);
                     _ = tempOut__2.get();
                     if (r != Result.Success) {
@@ -283,7 +284,7 @@ public final class RowReaderJsonExtensions {
 
                 case Decimal: {
                     java.math.BigDecimal value;
-                    OutObject<BigDecimal> tempOut_value14 = new OutObject<BigDecimal>();
+                    Out<BigDecimal> tempOut_value14 = new Out<BigDecimal>();
                     r = reader.get().ReadDecimal(tempOut_value14);
                     value = tempOut_value14.get();
                     if (r != Result.Success) {
@@ -296,7 +297,7 @@ public final class RowReaderJsonExtensions {
 
                 case DateTime: {
                     java.time.LocalDateTime value;
-                    OutObject<LocalDateTime> tempOut_value15 = new OutObject<LocalDateTime>();
+                    Out<LocalDateTime> tempOut_value15 = new Out<LocalDateTime>();
                     r = reader.get().ReadDateTime(tempOut_value15);
                     value = tempOut_value15.get();
                     if (r != Result.Success) {
@@ -311,8 +312,8 @@ public final class RowReaderJsonExtensions {
 
                 case UnixDateTime: {
                     UnixDateTime value;
-                    OutObject<UnixDateTime> tempOut_value16 =
-                        new OutObject<UnixDateTime>();
+                    Out<UnixDateTime> tempOut_value16 =
+                        new Out<UnixDateTime>();
                     r = reader.get().ReadUnixDateTime(tempOut_value16);
                     value = tempOut_value16.get();
                     if (r != Result.Success) {
@@ -325,7 +326,7 @@ public final class RowReaderJsonExtensions {
 
                 case Guid: {
                     java.util.UUID value;
-                    OutObject<UUID> tempOut_value17 = new OutObject<UUID>();
+                    Out<UUID> tempOut_value17 = new Out<UUID>();
                     r = reader.get().ReadGuid(tempOut_value17);
                     value = tempOut_value17.get();
                     if (r != Result.Success) {
@@ -340,7 +341,7 @@ public final class RowReaderJsonExtensions {
 
                 case MongoDbObjectId: {
                     MongoDbObjectId value;
-                    OutObject<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId> tempOut_value18 = new OutObject<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId>();
+                    Out<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId> tempOut_value18 = new Out<azure.data.cosmos.serialization.hybridrow.MongoDbObjectId>();
                     r = reader.get().ReadMongoDbObjectId(tempOut_value18);
                     value = tempOut_value18.get();
                     if (r != Result.Success) {
@@ -359,7 +360,7 @@ public final class RowReaderJsonExtensions {
                 case Utf8: {
                     Utf8Span value;
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword
-                    // - these cannot be converted using the 'OutObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Out' helper class unless the method is within the
                     // code being modified:
                     r = reader.get().ReadString(out value);
                     if (r != Result.Success) {
@@ -374,7 +375,7 @@ public final class RowReaderJsonExtensions {
 
                 case Binary: {
                     ReadOnlySpan<Byte> value;
-                    // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+                    // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadBinary(out ReadOnlySpan<byte> value);
                     r = reader.get().ReadBinary(out value);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonSettings.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonSettings.java
index a1e6fd8..2303e24 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonSettings.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/json/RowReaderJsonSettings.java
@@ -20,7 +20,7 @@ public final class RowReaderJsonSettings {
 
     /**
      * The quote character to use.
-     * May be <see cref="lang:\""/> or <see cref="'" />.
+     * May be <see cref="lang:\""/> or {@link '}.
      */
     public char QuoteChar;
 
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSequenceWritable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSequenceWritable.java
index 76e4dba..0351bad 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSequenceWritable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSequenceWritable.java
@@ -4,30 +4,33 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 /**
- * An optional interface that indicates a <see cref="LayoutType{T}" /> can also write using a
- * <see cref="ReadOnlySequence{T}" />.
+ * An optional interface that indicates a {@link LayoutType{T}} can also write using a {@link ReadOnlySequence{T}}.
  *
  * <typeparam name="TElement">The sub-element type to be written.</typeparam>
  */
 public interface ILayoutSequenceWritable<TElement> extends ILayoutType {
-    Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                      ReadOnlySequence<TElement> value);
 
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                       ReadOnlySequence<TElement> value);
+    Result WriteFixed(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, ReadOnlySequence<TElement> value);
 
-    //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
-    //ORIGINAL LINE: Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySequence<TElement> value,
-    // UpdateOptions options = UpdateOptions.Upsert);
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                       ReadOnlySequence<TElement> value, UpdateOptions options);
+    Result WriteSparse(
+        Reference<RowBuffer> b, Reference<RowCursor> edit, ReadOnlySequence<TElement> value);
 
-    Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                         ReadOnlySequence<TElement> value);
+    // C# TO JAVA CONVERTER NOTE:
+    // Java does not support optional parameters, hence overloaded method(s) are created
+    // ORIGINAL LINE:
+    // Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySequence<TElement> value, UpdateOptions
+    // options = UpdateOptions.Upsert);
+
+    Result WriteSparse(
+        Reference<RowBuffer> b, Reference<RowCursor> edit, ReadOnlySequence<TElement> value, UpdateOptions options);
+
+    Result WriteVariable(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, ReadOnlySequence<TElement> value);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanReadable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanReadable.java
index e986610..d39c829 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanReadable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanReadable.java
@@ -4,25 +4,24 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 /**
- * An optional interface that indicates a <see cref="LayoutType{T}" /> can also read using a
- * <see cref="ReadOnlySpan{T}" />.
+ * An optional interface that indicates a {@link LayoutType{T}} can also read using a {@link ReadOnlySpan{T}}
  *
  * <typeparam name="TElement">The sub-element type to be written.</typeparam>
  */
 public interface ILayoutSpanReadable<TElement> extends ILayoutType {
-    Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                     OutObject<ReadOnlySpan<TElement>> value);
+    Result ReadFixed(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<ReadOnlySpan<TElement>> value);
 
-    Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                      OutObject<ReadOnlySpan<TElement>> value);
+    Result ReadSparse(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, Out<ReadOnlySpan<TElement>> value);
 
-    Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                        OutObject<ReadOnlySpan<TElement>> value);
+    Result ReadVariable(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<ReadOnlySpan<TElement>> value);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanWritable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanWritable.java
index 8ddeb54..028c4a8 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanWritable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutSpanWritable.java
@@ -4,30 +4,32 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 /**
- * An optional interface that indicates a <see cref="LayoutType{T}" /> can also write using a
- * <see cref="ReadOnlySpan{T}" />.
+ * An optional interface that indicates a {@link LayoutType{T}} can also write using a
+ * {@link ReadOnlySpan{T}}.
  *
  * <typeparam name="TElement">The sub-element type to be written.</typeparam>
  */
 public interface ILayoutSpanWritable<TElement> extends ILayoutType {
-    Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                      ReadOnlySpan<TElement> value);
 
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                       ReadOnlySpan<TElement> value);
+    Result WriteFixed(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, ReadOnlySpan<TElement> value);
 
-    //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
-    //ORIGINAL LINE: Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySpan<TElement> value,
-    // UpdateOptions options = UpdateOptions.Upsert);
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                       ReadOnlySpan<TElement> value, UpdateOptions options);
+    Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, ReadOnlySpan<TElement> value);
 
-    Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                         ReadOnlySpan<TElement> value);
+    // C# TO JAVA CONVERTER NOTE:
+    // Java does not support optional parameters, hence overloaded method(s) are created.
+    // ORIGINAL LINE:
+    // Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySpan<TElement> value, UpdateOptions options = UpdateOptions.Upsert);
+
+    Result WriteSparse(
+        Reference<RowBuffer> b, Reference<RowCursor> edit, ReadOnlySpan<TElement> value, UpdateOptions options);
+
+    Result WriteVariable(
+        Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, ReadOnlySpan<TElement> value);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanReadable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanReadable.java
index 013d09b..615b67d 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanReadable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanReadable.java
@@ -4,22 +4,20 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 /**
- * An optional interface that indicates a <see cref="LayoutType{T}" /> can also read using a
- * <see cref="Utf8Span" />.
+ * An optional interface that indicates a {@link LayoutType{T}} can also read using a {@link Utf8Span}.
  */
 public interface ILayoutUtf8SpanReadable extends ILayoutType {
-    Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                     OutObject<Utf8Span> value);
 
-    Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> scope, OutObject<Utf8Span> value);
+    Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<Utf8Span> value);
 
-    Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                        OutObject<Utf8Span> value);
+    Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> scope, Out<Utf8Span> value);
+
+    Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<Utf8Span> value);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanWritable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanWritable.java
index cf6e979..b234a08 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanWritable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/ILayoutUtf8SpanWritable.java
@@ -4,26 +4,26 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 /**
- * An optional interface that indicates a <see cref="LayoutType{T}" /> can also write using a
- * <see cref="Utf8Span" />.
+ * An optional interface that indicates a {@link LayoutType{T}} can also write using a {@link Utf8Span}.
  */
 public interface ILayoutUtf8SpanWritable extends ILayoutType {
-    Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                      Utf8Span value);
 
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Utf8Span value);
+    Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Utf8Span value);
 
-    //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
-    //ORIGINAL LINE: Result WriteSparse(ref RowBuffer b, ref RowCursor edit, Utf8Span value, UpdateOptions options =
-    // UpdateOptions.Upsert);
-    Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Utf8Span value, UpdateOptions options);
+    Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Utf8Span value);
 
-    Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                         Utf8Span value);
+    // C# TO JAVA CONVERTER NOTE:
+    // Java does not support optional parameters, hence overloaded method(s) are created.
+    // ORIGINAL LINE:
+    // Result WriteSparse(ref RowBuffer b, ref RowCursor edit, Utf8Span value, UpdateOptions options = UpdateOptions.Upsert);
+
+    Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Utf8Span value, UpdateOptions options);
+
+    Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Utf8Span value);
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/Layout.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/Layout.java
index 465dc05..b376bb2 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/Layout.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/Layout.java
@@ -4,40 +4,44 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Utf8String;
 import com.azure.data.cosmos.serialization.hybridrow.SchemaId;
+import com.azure.data.cosmos.serialization.hybridrow.schemas.Namespace;
+import com.azure.data.cosmos.serialization.hybridrow.schemas.Schema;
 import com.azure.data.cosmos.serialization.hybridrow.schemas.StorageKind;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
- * A Layout describes the structure of a Hybrd Row.
+ * A Layout describes the structure of a Hybrid Row
  * <p>
- * A layout indicates the number, order, and type of all schematized columns to be stored
- * within a hybrid row.  The order and type of columns defines the physical ordering of bytes used to
- * encode the row and impacts the cost of updating the row.
- * <para />
- * A layout is created by compiling a <see cref="Schema" /> through <see cref="Schema.Compile" /> or
- * by constructor through a <see cref="LayoutBuilder" />.
- * <para />
- * <see cref="Layout" /> is immutable.
+ * A layout indicates the number, order, and type of all schematized columns to be stored within a hybrid row. The
+ * order and type of columns defines the physical ordering of bytes used to encode the row and impacts the cost of
+ * updating the row.
+ * <p>
+ * A layout is created by compiling a {@link Schema} through {@link Schema#Compile(Namespace)} or by constructor through
+ * a {@link LayoutBuilder}.
+ *
+ * {@link Layout} is immutable.
  */
 public final class Layout {
-    // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
-    //ORIGINAL LINE: [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",
-    // Justification = "Type is immutable.")] public static readonly Layout Empty = SystemSchema.LayoutResolver
-    // .Resolve(SystemSchema.EmptySchemaId);
+
+    // TODO: C# TO JAVA CONVERTER:
+    //  Java annotations will not correspond to .NET attributes:
+    //  ORIGINAL LINE:
+    //  [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "Type is immutable.")] public static readonly Layout Empty = SystemSchema.LayoutResolver.Resolve(SystemSchema.EmptySchemaId);
+
     public static final Layout Empty = SystemSchema.LayoutResolver.Resolve(SystemSchema.EmptySchemaId);
     /**
      * Name of the layout.
      * <p>
-     * Usually this is the name of the <see cref="Schema" /> from which this
-     * <see cref="Layout" /> was generated.
+     * Usually this is the name of the {@link Schema} from which this {@link Layout} was generated.
      */
     private String Name;
     /**
-     * The number of bitmask bytes allocated within the layout.
+     * The number of bit mask bytes allocated within the layout.
      * <p>
      * A presence bit is allocated for each fixed and variable-length field.  Sparse columns
      * never have presence bits.  Fixed boolean allocate an additional bit from the bitmask to store their
@@ -53,7 +57,7 @@ public final class Layout {
      */
     private int NumVariable;
     /**
-     * Unique identifier of the schema from which this <see cref="Layout" /> was generated.
+     * Unique identifier of the schema from which this {@link Layout} was generated.
      */
     private com.azure.data.cosmos.serialization.hybridrow.SchemaId SchemaId = new SchemaId();
     /**
@@ -67,8 +71,7 @@ public final class Layout {
     private HashMap<String, LayoutColumn> pathStringMap;
     private LayoutColumn[] topColumns;
 
-    public Layout(String name, SchemaId schemaId, int numBitmaskBytes, int minRequiredSize,
-                  ArrayList<LayoutColumn> columns) {
+    public Layout(String name, SchemaId schemaId, int numBitmaskBytes, int minRequiredSize, ArrayList<LayoutColumn> columns) {
         this.Name = name;
         this.SchemaId = schemaId.clone();
         this.NumBitmaskBytes = numBitmaskBytes;
@@ -133,10 +136,11 @@ public final class Layout {
      * Finds a column specification for a column with a matching path.
      *
      * @param path   The path of the column to find.
-     * @param column If found, the column specification, otherwise null.
-     * @return True if a column with the path is found, otherwise false.
+     * @param column If found, the column specification, otherwise {@code null}.
+     * @return {@code true} if a column with the path is found, otherwise {@code false}.
      */
-    public boolean TryFind(UtfAnyString path, OutObject<LayoutColumn> column) {
+    public boolean TryFind(UtfAnyString path, Out<LayoutColumn> column) {
+
         if (path.IsNull) {
             column.set(null);
             return false;
@@ -156,12 +160,12 @@ public final class Layout {
      * @param column If found, the column specification, otherwise null.
      * @return True if a column with the path is found, otherwise false.
      */
-    public boolean TryFind(String path, OutObject<LayoutColumn> column) {
+    public boolean TryFind(String path, Out<LayoutColumn> column) {
         return (this.pathStringMap.containsKey(path) && (column.set(this.pathStringMap.get(path))) == column.get());
     }
 
     /**
-     * Returns a human readable diagnostic string representation of this <see cref="Layout" />.
+     * Returns a human readable diagnostic string representation of this {@link Layout}.
      * This representation should only be used for debugging and diagnostic purposes.
      */
     @Override
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutArray.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutArray.java
index e7f4a7b..6cf610a 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutArray.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutArray.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -32,10 +32,10 @@ public final class LayoutArray extends LayoutIndexedScope {
 
     @Override
     public Result WriteScope(
-        RefObject<RowBuffer> b,
-        RefObject<RowCursor> edit,
+        Reference<RowBuffer> b,
+        Reference<RowCursor> edit,
         TypeArgumentList typeArgs,
-        OutObject<RowCursor> value
+        Out<RowCursor> value
     ) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
@@ -44,8 +44,8 @@ public final class LayoutArray extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
             value.set(null);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBinary.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBinary.java
index 5582eab..e7d8f65 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBinary.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBinary.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -35,11 +36,11 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // byte[] value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<byte[]> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<byte[]> value) {
         ReadOnlySpan<Byte> span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Result r = this.ReadFixed(ref b, ref scope, col, out ReadOnlySpan<byte> span);
         Result r = this.ReadFixed(b, scope, col, out span);
@@ -51,8 +52,8 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ReadOnlySpan<byte> value)
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<ReadOnlySpan<Byte>> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<ReadOnlySpan<Byte>> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         checkArgument(col.getSize() >= 0);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
@@ -67,10 +68,10 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out byte[] value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<byte[]> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<byte[]> value) {
         ReadOnlySpan<Byte> span;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Result r = this.ReadSparse(ref b, ref edit, out ReadOnlySpan<byte> span);
         Result r = this.ReadSparse(b, edit, out span);
@@ -81,7 +82,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out ReadOnlySpan<byte> value)
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, OutObject<ReadOnlySpan<Byte>> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Out<ReadOnlySpan<Byte>> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -96,11 +97,11 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public override Result ReadVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // byte[] value)
     @Override
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col
-        , OutObject<byte[]> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col
+        , Out<byte[]> value) {
         ReadOnlySpan<Byte> span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Result r = this.ReadVariable(ref b, ref scope, col, out ReadOnlySpan<byte> span);
         Result r = this.ReadVariable(b, scope, col, out span);
@@ -112,8 +113,8 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result ReadVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ReadOnlySpan<byte> value)
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col
-        , OutObject<ReadOnlySpan<Byte>> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col
+        , Out<ReadOnlySpan<Byte>> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -130,7 +131,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, byte[]
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              byte[] value) {
         checkArgument(value != null);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -141,7 +142,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // ReadOnlySpan<byte> value)
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              ReadOnlySpan<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         checkArgument(col.getSize() >= 0);
@@ -158,7 +159,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // ReadOnlySequence<byte> value)
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              ReadOnlySequence<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         checkArgument(col.getSize() >= 0);
@@ -173,7 +174,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte[] value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte[] value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 
@@ -182,7 +183,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte[] value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte[] value,
                               UpdateOptions options) {
         checkArgument(value != null);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -190,7 +191,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
         return this.WriteSparse(b, edit, new ReadOnlySpan<Byte>(value), options);
     }
 
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               ReadOnlySpan<Byte> value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
@@ -199,7 +200,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySpan<byte> value,
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               ReadOnlySpan<Byte> value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -210,7 +211,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
         return Result.Success;
     }
 
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               ReadOnlySequence<Byte> value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
@@ -219,7 +220,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public Result WriteSparse(ref RowBuffer b, ref RowCursor edit, ReadOnlySequence<byte> value,
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               ReadOnlySequence<Byte> value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -234,7 +235,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //ORIGINAL LINE: public override Result WriteVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // byte[] value)
     @Override
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, byte[] value) {
         checkArgument(value != null);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -245,7 +246,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result WriteVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // ReadOnlySpan<byte> value)
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, ReadOnlySpan<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -261,7 +262,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
         int varOffset = b.get().ComputeVariableValueOffset(scope.get().layout, scope.get().start,
             col.getOffset());
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         b.get().WriteVariableBinary(varOffset, value, exists, tempOut_shift);
         shift = tempOut_shift.get();
         b.get().SetBit(scope.get().start, col.getNullBit().clone());
@@ -273,7 +274,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result WriteVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // ReadOnlySequence<byte> value)
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, ReadOnlySequence<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -289,7 +290,7 @@ public final class LayoutBinary extends LayoutType<byte[]> implements ILayoutSpa
         int varOffset = b.get().ComputeVariableValueOffset(scope.get().layout, scope.get().start,
             col.getOffset());
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         b.get().WriteVariableBinary(varOffset, value, exists, tempOut_shift);
         shift = tempOut_shift.get();
         b.get().SetBit(scope.get().start, col.getNullBit().clone());
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBit.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBit.java
index 42fbb47..2a5c4a3 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBit.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBit.java
@@ -22,7 +22,7 @@ public final class LayoutBit implements IEquatable<LayoutBit> {
     private int index;
 
     /**
-     * Initializes a new instance of the <see cref="LayoutBit" /> struct.
+     * Initializes a new instance of the {@link LayoutBit} struct.
      *
      * @param index The 0-based offset into the layout bitmask.
      */
@@ -47,7 +47,7 @@ public final class LayoutBit implements IEquatable<LayoutBit> {
 
     /**
      * Returns the 0-based bit from the beginning of the byte that contains this bit.
-     * Also see <see cref="GetOffset" /> to identify relevant byte.
+     * Also see {@link GetOffset} to identify relevant byte.
      *
      * @return The bit of the byte within the bitmask.
      */
@@ -61,7 +61,7 @@ public final class LayoutBit implements IEquatable<LayoutBit> {
      * Returns the 0-based byte offset from the beginning of the row or scope that contains the
      * bit from the bitmask.
      * <p>
-     * Also see <see cref="GetBit" /> to identify.
+     * Also see {@link GetBit} to identify.
      *
      * @param offset The byte offset from the beginning of the row where the scope begins.
      * @return The byte offset containing this bit.
@@ -130,7 +130,7 @@ public final class LayoutBit implements IEquatable<LayoutBit> {
         private int next;
 
         /**
-         * Initializes a new instance of the <see cref="Allocator" /> class.
+         * Initializes a new instance of the {@link Allocator} class.
          */
         public Allocator() {
             this.next = 0;
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBoolean.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBoolean.java
index da2d04b..dd55122 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBoolean.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutBoolean.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,8 +34,8 @@ public final class LayoutBoolean extends LayoutType<Boolean> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Boolean> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Boolean> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(false);
@@ -46,8 +47,8 @@ public final class LayoutBoolean extends LayoutType<Boolean> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Boolean> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Boolean> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(false);
@@ -59,7 +60,7 @@ public final class LayoutBoolean extends LayoutType<Boolean> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              boolean value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -80,7 +81,7 @@ public final class LayoutBoolean extends LayoutType<Boolean> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, bool value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, boolean value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, boolean value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -92,7 +93,7 @@ public final class LayoutBoolean extends LayoutType<Boolean> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, boolean value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, boolean value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCodeTraits.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCodeTraits.java
index 06e5993..a5ea7f9 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCodeTraits.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCodeTraits.java
@@ -18,7 +18,7 @@ public final class LayoutCodeTraits {
     /**
      * Returns a canonicalized version of the layout code.
      * <p>
-     * Some codes (e.g. <see cref="LayoutCode.Boolean" /> use multiple type codes to also encode
+     * Some codes (e.g. {@link LayoutCode.Boolean} use multiple type codes to also encode
      * values.  This function converts actual value based code into the canonicalized type code for schema
      * comparisons.
      *
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutColumn.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutColumn.java
index 0ae9efe..040bf60 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutColumn.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutColumn.java
@@ -4,6 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
+import com.azure.data.cosmos.core.Utf8String;
 import com.azure.data.cosmos.serialization.hybridrow.schemas.StorageKind;
 
 import static com.google.common.base.Strings.lenientFormat;
@@ -30,13 +31,13 @@ public final class LayoutColumn {
      */
     private LayoutBit nullBit = new LayoutBit();
     /**
-     * If <see cref="storage" /> equals <see cref="StorageKind.Fixed" /> then the byte offset to
+     * If {@link storage} equals {@link StorageKind.Fixed} then the byte offset to
      * the field location.
      * <para />
-     * If <see cref="storage" /> equals <see cref="StorageKind.Variable" /> then the 0-based index of the
+     * If {@link storage} equals {@link StorageKind.Variable} then the 0-based index of the
      * field from the beginning of the variable length segment.
      * <para />
-     * For all other values of <see cref="storage" />, <see cref="Offset" /> is ignored.
+     * For all other values of {@link storage}, {@link Offset} is ignored.
      */
     private int offset;
     /**
@@ -48,7 +49,7 @@ public final class LayoutColumn {
      */
     private Utf8String path;
     /**
-     * If <see cref="LayoutType.IsBool" /> then the 0-based extra index within the bool byte
+     * If {@link LayoutType.IsBool} then the 0-based extra index within the bool byte
      * holding the value of this type, otherwise must be 0.
      */
     private int size;
@@ -65,12 +66,12 @@ public final class LayoutColumn {
      */
     private TypeArgument typeArg = new TypeArgument();
     /**
-     * For types with generic parameters (e.g. <see cref="LayoutTuple" />, the type parameters.
+     * For types with generic parameters (e.g. {@link LayoutTuple}, the type parameters.
      */
     private TypeArgumentList typeArgs = new TypeArgumentList();
 
     /**
-     * Initializes a new instance of the <see cref="LayoutColumn" /> class.
+     * Initializes a new instance of the {@link LayoutColumn} class.
      *
      * @param path     The path to the field relative to parent scope.
      * @param type     Type of the field.
@@ -81,7 +82,7 @@ public final class LayoutColumn {
      * @param nullBit  0-based index into the bit mask for the null bit.
      * @param boolBit  For bool fields, 0-based index into the bit mask for the bool value.
      * @param length   For variable length types the length, otherwise 0.
-     * @param typeArgs For types with generic parameters (e.g. <see cref="LayoutTuple" />, the type
+     * @param typeArgs For types with generic parameters (e.g. {@link LayoutTuple}, the type
      *                 parameters.
      */
 
@@ -112,8 +113,8 @@ public final class LayoutColumn {
     /**
      * The full logical path of the field within the row.
      * <p>
-     * Paths are expressed in dotted notation: e.g. a relative <see cref="Path" /> of 'b.c'
-     * within the scope 'a' yields a <see cref="FullPath" /> of 'a.b.c'.
+     * Paths are expressed in dotted notation: e.g. a relative {@link Path} of 'b.c'
+     * within the scope 'a' yields a {@link FullPath} of 'a.b.c'.
      */
     public Utf8String getFullPath() {
         return this.fullPath;
@@ -137,8 +138,8 @@ public final class LayoutColumn {
     /**
      * The relative path of the field within its parent scope.
      * <p>
-     * Paths are expressed in dotted notation: e.g. a relative <see cref="Path" /> of 'b.c'
-     * within the scope 'a' yields a <see cref="FullPath" /> of 'a.b.c'.
+     * Paths are expressed in dotted notation: e.g. a relative {@link Path} of 'b.c'
+     * within the scope 'a' yields a {@link FullPath} of 'a.b.c'.
      */
     public Utf8String getPath() {
         return this.path;
@@ -166,7 +167,7 @@ public final class LayoutColumn {
     }
 
     /**
-     * For types with generic parameters (e.g. <see cref="LayoutTuple" />, the type parameters.
+     * For types with generic parameters (e.g. {@link LayoutTuple}, the type parameters.
      */
     public TypeArgumentList getTypeArgs() {
         return this.typeArgs.clone();
@@ -200,21 +201,21 @@ public final class LayoutColumn {
     LayoutBit getNullBit()
 
     /**
-     * If <see cref="storage" /> equals <see cref="StorageKind.Fixed" /> then the byte offset to
+     * If {@link storage} equals {@link StorageKind.Fixed} then the byte offset to
      * the field location.
      * <para />
-     * If <see cref="storage" /> equals <see cref="StorageKind.Variable" /> then the 0-based index of the
+     * If {@link storage} equals {@link StorageKind.Variable} then the 0-based index of the
      * field from the beginning of the variable length segment.
      * <para />
-     * For all other values of <see cref="storage" />, <see cref="Offset" /> is ignored.
+     * For all other values of {@link storage}, {@link Offset} is ignored.
      */
     int getOffset()
 
     /**
-     * If <see cref="storage" /> equals <see cref="StorageKind.Fixed" /> then the fixed number of
+     * If {@link storage} equals {@link StorageKind.Fixed} then the fixed number of
      * bytes reserved for the value.
      * <para />
-     * If <see cref="storage" /> equals <see cref="StorageKind.Variable" /> then the maximum number of
+     * If {@link storage} equals {@link StorageKind.Variable} then the maximum number of
      * bytes allowed for the value.
      */
     int getSize()
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCompiler.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCompiler.java
index ae4c1d3..dddda74 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCompiler.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutCompiler.java
@@ -4,7 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
 import com.azure.data.cosmos.serialization.hybridrow.SchemaId;
 import com.azure.data.cosmos.serialization.hybridrow.schemas.ArrayPropertyType;
 import com.azure.data.cosmos.serialization.hybridrow.schemas.MapPropertyType;
@@ -53,8 +53,8 @@ public final class LayoutCompiler {
                                       ArrayList<Property> properties) {
         for (Property p : properties) {
             TypeArgumentList typeArgs = new TypeArgumentList();
-            OutObject<TypeArgumentList> tempOut_typeArgs =
-                new OutObject<TypeArgumentList>();
+            Out<TypeArgumentList> tempOut_typeArgs =
+                new Out<TypeArgumentList>();
             LayoutType type = LayoutCompiler.LogicalToPhysicalType(ns, p.getPropertyType(), tempOut_typeArgs);
             typeArgs = tempOut_typeArgs.get();
             switch (LayoutCodeTraits.ClearImmutableBit(type.LayoutCode)) {
@@ -149,7 +149,7 @@ public final class LayoutCompiler {
     }
 
     private static LayoutType LogicalToPhysicalType(Namespace ns, PropertyType logicalType,
-                                                    OutObject<TypeArgumentList> typeArgs) {
+                                                    Out<TypeArgumentList> typeArgs) {
         typeArgs.set(TypeArgumentList.Empty);
         boolean tempVar =
             (logicalType instanceof ScopePropertyType ? (ScopePropertyType)logicalType : null).getImmutable();
@@ -209,7 +209,7 @@ public final class LayoutCompiler {
                 ArrayPropertyType ap = (ArrayPropertyType)logicalType;
                 if ((ap.getItems() != null) && (ap.getItems().getType() != TypeKind.Any)) {
                     TypeArgumentList itemTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_itemTypeArgs = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_itemTypeArgs = new Out<TypeArgumentList>();
                     LayoutType itemType = LayoutCompiler.LogicalToPhysicalType(ns, ap.getItems(), tempOut_itemTypeArgs);
                     itemTypeArgs = tempOut_itemTypeArgs.get();
                     if (ap.getItems().getNullable()) {
@@ -228,7 +228,7 @@ public final class LayoutCompiler {
                 SetPropertyType sp = (SetPropertyType)logicalType;
                 if ((sp.getItems() != null) && (sp.getItems().getType() != TypeKind.Any)) {
                     TypeArgumentList itemTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_itemTypeArgs2 = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_itemTypeArgs2 = new Out<TypeArgumentList>();
                     LayoutType itemType = LayoutCompiler.LogicalToPhysicalType(ns, sp.getItems(),
                         tempOut_itemTypeArgs2);
                     itemTypeArgs = tempOut_itemTypeArgs2.get();
@@ -251,7 +251,7 @@ public final class LayoutCompiler {
                 MapPropertyType mp = (MapPropertyType)logicalType;
                 if ((mp.getKeys() != null) && (mp.getKeys().getType() != TypeKind.Any) && (mp.getValues() != null) && (mp.getValues().getType() != TypeKind.Any)) {
                     TypeArgumentList keyTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_keyTypeArgs = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_keyTypeArgs = new Out<TypeArgumentList>();
                     LayoutType keyType = LayoutCompiler.LogicalToPhysicalType(ns, mp.getKeys(), tempOut_keyTypeArgs);
                     keyTypeArgs = tempOut_keyTypeArgs.get();
                     if (mp.getKeys().getNullable()) {
@@ -261,7 +261,7 @@ public final class LayoutCompiler {
                     }
 
                     TypeArgumentList valueTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_valueTypeArgs = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_valueTypeArgs = new Out<TypeArgumentList>();
                     LayoutType valueType = LayoutCompiler.LogicalToPhysicalType(ns, mp.getValues(),
                         tempOut_valueTypeArgs);
                     valueTypeArgs = tempOut_valueTypeArgs.get();
@@ -288,7 +288,7 @@ public final class LayoutCompiler {
                 TypeArgument[] args = new TypeArgument[tp.getItems().size()];
                 for (int i = 0; i < tp.getItems().size(); i++) {
                     TypeArgumentList itemTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_itemTypeArgs3 = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_itemTypeArgs3 = new Out<TypeArgumentList>();
                     LayoutType itemType = LayoutCompiler.LogicalToPhysicalType(ns, tp.getItems().get(i),
                         tempOut_itemTypeArgs3);
                     itemTypeArgs = tempOut_itemTypeArgs3.get();
@@ -316,7 +316,7 @@ public final class LayoutCompiler {
                 tgArgs[0] = new TypeArgument(LayoutType.UInt8, TypeArgumentList.Empty);
                 for (int i = 0; i < tg.getItems().size(); i++) {
                     TypeArgumentList itemTypeArgs = new TypeArgumentList();
-                    OutObject<TypeArgumentList> tempOut_itemTypeArgs4 = new OutObject<TypeArgumentList>();
+                    Out<TypeArgumentList> tempOut_itemTypeArgs4 = new Out<TypeArgumentList>();
                     LayoutType itemType = LayoutCompiler.LogicalToPhysicalType(ns, tg.getItems().get(i),
                         tempOut_itemTypeArgs4);
                     itemTypeArgs = tempOut_itemTypeArgs4.get();
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDateTime.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDateTime.java
index 90dbb68..baa5e5f 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDateTime.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDateTime.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,8 +31,8 @@ public final class LayoutDateTime extends LayoutType<DateTime> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<LocalDateTime> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<LocalDateTime> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(LocalDateTime.MIN);
@@ -43,8 +44,8 @@ public final class LayoutDateTime extends LayoutType<DateTime> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<LocalDateTime> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<LocalDateTime> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(LocalDateTime.MIN);
@@ -56,7 +57,7 @@ public final class LayoutDateTime extends LayoutType<DateTime> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              LocalDateTime value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -72,7 +73,7 @@ public final class LayoutDateTime extends LayoutType<DateTime> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, DateTime value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               LocalDateTime value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -84,7 +85,7 @@ public final class LayoutDateTime extends LayoutType<DateTime> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, DateTime value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, DateTime value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDecimal.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDecimal.java
index b9a38b5..70e7da1 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDecimal.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutDecimal.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -31,8 +32,8 @@ public final class LayoutDecimal extends LayoutType<BigDecimal> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<BigDecimal> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<BigDecimal> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(new BigDecimal(0));
@@ -44,8 +45,8 @@ public final class LayoutDecimal extends LayoutType<BigDecimal> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<BigDecimal> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<BigDecimal> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(new BigDecimal(0));
@@ -57,7 +58,7 @@ public final class LayoutDecimal extends LayoutType<BigDecimal> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              BigDecimal value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -73,7 +74,7 @@ public final class LayoutDecimal extends LayoutType<BigDecimal> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, decimal value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, BigDecimal value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, BigDecimal value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -85,7 +86,7 @@ public final class LayoutDecimal extends LayoutType<BigDecimal> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               java.math.BigDecimal value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutEndScope.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutEndScope.java
index 67156d7..dbd8a72 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutEndScope.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutEndScope.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -27,8 +28,8 @@ public final class LayoutEndScope extends LayoutScope {
 
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, scope, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -36,8 +37,8 @@ public final class LayoutEndScope extends LayoutScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor scope, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Contract.Fail("Cannot write an EndScope directly");
         value.set(null);
         return Result.Failure;
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat128.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat128.java
index 8996269..1ce47bb 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat128.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat128.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -29,8 +30,8 @@ public final class LayoutFloat128 extends LayoutType<com.azure.data.cosmos.seria
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Float128> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Float128> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -42,8 +43,8 @@ public final class LayoutFloat128 extends LayoutType<com.azure.data.cosmos.seria
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Float128> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Float128> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -55,7 +56,7 @@ public final class LayoutFloat128 extends LayoutType<com.azure.data.cosmos.seria
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              Float128 value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -71,7 +72,7 @@ public final class LayoutFloat128 extends LayoutType<com.azure.data.cosmos.seria
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, Float128 value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Float128 value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Float128 value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -83,7 +84,7 @@ public final class LayoutFloat128 extends LayoutType<com.azure.data.cosmos.seria
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Float128 value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Float128 value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat32.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat32.java
index 7cc31c3..10aadfc 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat32.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat32.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutFloat32 extends LayoutType<Float> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Float> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Float> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutFloat32 extends LayoutType<Float> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Float> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Float> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutFloat32 extends LayoutType<Float> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              float value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutFloat32 extends LayoutType<Float> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, float value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, float value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, float value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutFloat32 extends LayoutType<Float> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, float value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, float value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat64.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat64.java
index 0dcc8c6..5aedf2a 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat64.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutFloat64.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutFloat64 extends LayoutType<Double> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Double> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Double> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutFloat64 extends LayoutType<Double> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Double> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Double> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutFloat64 extends LayoutType<Double> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              double value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutFloat64 extends LayoutType<Double> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, double value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, double value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, double value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutFloat64 extends LayoutType<Double> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, double value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, double value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutGuid.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutGuid.java
index ffc1913..7ee1aae 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutGuid.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutGuid.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,8 +31,8 @@ public final class LayoutGuid extends LayoutType<UUID> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<UUID> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<UUID> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -43,8 +44,8 @@ public final class LayoutGuid extends LayoutType<UUID> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<UUID> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<UUID> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -56,7 +57,7 @@ public final class LayoutGuid extends LayoutType<UUID> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              UUID value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -72,7 +73,7 @@ public final class LayoutGuid extends LayoutType<UUID> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, Guid value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, UUID value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, UUID value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -84,7 +85,7 @@ public final class LayoutGuid extends LayoutType<UUID> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               java.util.UUID value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutIndexedScope.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutIndexedScope.java
index 4919540..78c0ad0 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutIndexedScope.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutIndexedScope.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
@@ -22,7 +23,7 @@ public abstract class LayoutIndexedScope extends LayoutScope {
     }
 
     @Override
-    public void ReadSparsePath(RefObject<RowBuffer> row, RefObject<RowCursor> edit) {
+    public void ReadSparsePath(Reference<RowBuffer> row, Reference<RowCursor> edit) {
         edit.get().pathToken = 0;
         edit.get().pathOffset = 0;
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt16.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt16.java
index 51ea736..5e8d4c6 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt16.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt16.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutInt16 extends LayoutType<Short> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Short> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Short> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutInt16 extends LayoutType<Short> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Short> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Short> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutInt16 extends LayoutType<Short> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              short value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutInt16 extends LayoutType<Short> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, short value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, short value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, short value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutInt16 extends LayoutType<Short> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, short value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, short value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt32.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt32.java
index 237e14b..f758cc2 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt32.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt32.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutInt32 extends LayoutType<Integer> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Integer> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Integer> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutInt32 extends LayoutType<Integer> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Integer> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Integer> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutInt32 extends LayoutType<Integer> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              int value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutInt32 extends LayoutType<Integer> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, int value, UpdateOptions
     // options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, int value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, int value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutInt32 extends LayoutType<Integer> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, int value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, int value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt64.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt64.java
index fffd7dc..3e33066 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt64.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt64.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutInt64 extends LayoutType<Long> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Long> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Long> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutInt64 extends LayoutType<Long> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Long> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Long> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutInt64 extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              long value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutInt64 extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, long value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutInt64 extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt8.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt8.java
index d6102ea..7640053 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt8.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutInt8.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,8 +29,8 @@ public final class LayoutInt8 extends LayoutType<Byte> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Byte> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -41,8 +42,8 @@ public final class LayoutInt8 extends LayoutType<Byte> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Byte> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Byte> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -54,7 +55,7 @@ public final class LayoutInt8 extends LayoutType<Byte> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              byte value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -70,7 +71,7 @@ public final class LayoutInt8 extends LayoutType<Byte> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, sbyte value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -82,7 +83,7 @@ public final class LayoutInt8 extends LayoutType<Byte> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutMongoDbObjectId.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutMongoDbObjectId.java
index 7e862f1..1d01aad 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutMongoDbObjectId.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutMongoDbObjectId.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -29,8 +30,8 @@ public final class LayoutMongoDbObjectId extends LayoutType<MongoDbObjectId> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<MongoDbObjectId> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<MongoDbObjectId> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -42,8 +43,8 @@ public final class LayoutMongoDbObjectId extends LayoutType<MongoDbObjectId> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<MongoDbObjectId> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<MongoDbObjectId> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -55,7 +56,7 @@ public final class LayoutMongoDbObjectId extends LayoutType<MongoDbObjectId> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              MongoDbObjectId value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -71,7 +72,7 @@ public final class LayoutMongoDbObjectId extends LayoutType<MongoDbObjectId> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, MongoDbObjectId value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               MongoDbObjectId value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -83,7 +84,7 @@ public final class LayoutMongoDbObjectId extends LayoutType<MongoDbObjectId> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
                               MongoDbObjectId value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNull.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNull.java
index adaefd6..5907f5a 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNull.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNull.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -34,8 +35,8 @@ public final class LayoutNull extends LayoutType<NullValue> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<NullValue> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<NullValue> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         value.set(NullValue.Default);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
@@ -46,8 +47,8 @@ public final class LayoutNull extends LayoutType<NullValue> {
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<NullValue> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<NullValue> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -59,7 +60,7 @@ public final class LayoutNull extends LayoutType<NullValue> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              NullValue value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -74,7 +75,7 @@ public final class LayoutNull extends LayoutType<NullValue> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, NullValue value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, NullValue value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, NullValue value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -86,7 +87,7 @@ public final class LayoutNull extends LayoutType<NullValue> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, NullValue value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, NullValue value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNullable.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNullable.java
index a348457..735b325 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNullable.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutNullable.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -31,14 +32,14 @@ public final class LayoutNullable extends LayoutIndexedScope {
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkState(edit.get().index >= 0);
         checkState(edit.get().scopeTypeArgs.getCount() == 1);
         checkState(edit.get().index == 1);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(0).getType().LayoutCode);
     }
 
-    public static Result HasValue(RefObject<RowBuffer> b, RefObject<RowCursor> scope) {
+    public static Result HasValue(Reference<RowBuffer> b, Reference<RowCursor> scope) {
         checkArgument(scope.get().scopeType instanceof LayoutNullable);
         checkState(scope.get().index == 1 || scope.get().index == 2, "Nullable scopes always point at the value");
         checkState(scope.get().scopeTypeArgs.getCount() == 1);
@@ -47,28 +48,28 @@ public final class LayoutNullable extends LayoutIndexedScope {
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         return new TypeArgumentList(new TypeArgument[] { LayoutType.ReadTypeArgument(row, offset, lenInBytes) });
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         checkState(edit.get().index == 1);
         edit.get().cellType = edit.get().scopeTypeArgs.get(0).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(0).getTypeArgs().clone();
     }
 
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, boolean hasValue, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, boolean hasValue, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, hasValue, value, UpdateOptions.Upsert);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList typeArgs, bool
     // hasValue, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, boolean hasValue, OutObject<RowCursor> value,
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, boolean hasValue, Out<RowCursor> value,
                              UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
@@ -81,8 +82,8 @@ public final class LayoutNullable extends LayoutIndexedScope {
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -90,13 +91,13 @@ public final class LayoutNullable extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         return this.WriteScope(b, edit, typeArgs.clone(), true, value, options);
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkState(value.getCount() == 1);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutObject.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutObject.java
index 0ab2362..385e56d 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutObject.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutObject.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,8 +31,8 @@ public final class LayoutObject extends LayoutPropertyScope {
 
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -39,8 +40,8 @@ public final class LayoutObject extends LayoutPropertyScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
             value.set(null);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutResolverNamespace.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutResolverNamespace.java
index 2247dac..e043b6b 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutResolverNamespace.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutResolverNamespace.java
@@ -12,12 +12,12 @@ import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.lenientFormat;
 
 /**
- * An implementation of <see cref="LayoutResolver" /> which dynamically compiles schema from
- * a <see cref="Namespace" />.
+ * An implementation of {@link LayoutResolver} which dynamically compiles schema from
+ * a {@link Namespace}.
  * <p>
  * <p>
- * This resolver assumes that <see cref="Schema" /> within the <see cref="Namespace" /> have
- * their <see cref="Schema.SchemaId" /> properly populated. The resolver caches compiled schema.
+ * This resolver assumes that {@link Schema} within the {@link Namespace} have
+ * their {@link Schema.SchemaId} properly populated. The resolver caches compiled schema.
  * <p>
  * All members of this class are multi-thread safe.
  */
@@ -49,7 +49,7 @@ public final class LayoutResolverNamespace extends LayoutResolver {
         // TODO: C# TO JAVA CONVERTER: There is no Java ConcurrentHashMap equivalent to this .NET
         // ConcurrentDictionary method:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (this.layoutCache.TryGetValue(schemaId.getId(), out layout)) {
             return layout;
         }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutScope.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutScope.java
index 690f329..9eeacd3 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutScope.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutScope.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -51,7 +52,7 @@ public abstract class LayoutScope extends LayoutType {
         return false;
     }
 
-    public final Result DeleteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit) {
+    public final Result DeleteScope(Reference<RowBuffer> b, Reference<RowCursor> edit) {
         Result result = LayoutType.PrepareSparseDelete(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             return result;
@@ -68,12 +69,12 @@ public abstract class LayoutScope extends LayoutType {
      * @param edit
      * @return True if the type code is implied (not written), false otherwise.
      */
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         return false;
     }
 
-    public final Result ReadScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                                  OutObject<RowCursor> value) {
+    public final Result ReadScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                                  Out<RowCursor> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -85,32 +86,32 @@ public abstract class LayoutScope extends LayoutType {
         return Result.Success;
     }
 
-    public void ReadSparsePath(RefObject<RowBuffer> row, RefObject<RowCursor> edit) {
+    public void ReadSparsePath(Reference<RowBuffer> row, Reference<RowCursor> edit) {
         int pathLenInBytes;
-        OutObject<Integer> tempOut_pathLenInBytes = new OutObject<Integer>();
-        OutObject<Integer> tempOut_pathOffset = new OutObject<Integer>();
+        Out<Integer> tempOut_pathLenInBytes = new Out<Integer>();
+        Out<Integer> tempOut_pathOffset = new Out<Integer>();
         edit.get().pathToken = row.get().ReadSparsePathLen(edit.get().layout, edit.get().valueOffset, tempOut_pathLenInBytes, tempOut_pathOffset);
         edit.get().argValue.pathOffset = tempOut_pathOffset.get();
         pathLenInBytes = tempOut_pathLenInBytes.get();
         edit.get().valueOffset += pathLenInBytes;
     }
 
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         throw new NotImplementedException();
     }
 
     public abstract Result WriteScope(
-        RefObject<RowBuffer> b, RefObject<RowCursor> scope, TypeArgumentList typeArgs,
-        OutObject<RowCursor> value);
+        Reference<RowBuffer> b, Reference<RowCursor> scope, TypeArgumentList typeArgs,
+        Out<RowCursor> value);
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public abstract Result WriteScope(ref RowBuffer b, ref RowCursor scope, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert);
-    public abstract Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                                      TypeArgumentList typeArgs, OutObject<RowCursor> value,
+    public abstract Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
+                                      TypeArgumentList typeArgs, Out<RowCursor> value,
                                       UpdateOptions options);
 
-    public <TContext> Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public <TContext> Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                         TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func) {
         return WriteScope(b, scope, typeArgs, context, func, UpdateOptions.Upsert);
     }
@@ -119,37 +120,37 @@ public abstract class LayoutScope extends LayoutType {
     //ORIGINAL LINE: public virtual Result WriteScope<TContext>(ref RowBuffer b, ref RowCursor scope,
     // TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func, UpdateOptions options = UpdateOptions
     // .Upsert)
-    public <TContext> Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public <TContext> Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                         TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func,
                                         UpdateOptions options) {
         RowCursor childScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.WriteScope(b, scope, typeArgs.clone(), out childScope, options);
         if (r != Result.Success) {
             return r;
         }
 
-        RefObject<RowCursor> tempRef_childScope =
-            new RefObject<RowCursor>(childScope);
+        Reference<RowCursor> tempReference_childScope =
+            new Reference<RowCursor>(childScope);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         r = func == null ? null : func.Invoke(ref b, ref childScope, context) ??Result.Success;
-        childScope = tempRef_childScope.get();
+        childScope = tempReference_childScope.get();
         if (r != Result.Success) {
             this.DeleteScope(b, scope);
             return r;
         }
 
-        RefObject<RowCursor> tempRef_childScope2 =
-            new RefObject<RowCursor>(childScope);
+        Reference<RowCursor> tempReference_childScope2 =
+            new Reference<RowCursor>(childScope);
         RowCursorExtensions.Skip(scope.get().clone(), b,
-            tempRef_childScope2);
-        childScope = tempRef_childScope2.get();
+            tempReference_childScope2);
+        childScope = tempReference_childScope2.get();
         return Result.Success;
     }
 
     /**
-     * A function to write content into a <see cref="RowBuffer" />.
+     * A function to write content into a {@link RowBuffer}.
      * <typeparam name="TContext">The type of the context value passed by the caller.</typeparam>
      *
      * @param b       The row to write to.
@@ -159,6 +160,6 @@ public abstract class LayoutScope extends LayoutType {
      */
     @FunctionalInterface
     public interface WriterFunc<TContext> {
-        Result invoke(RefObject<RowBuffer> b, RefObject<RowCursor> scope, TContext context);
+        Result invoke(Reference<RowBuffer> b, Reference<RowCursor> scope, TContext context);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged.java
index bd83053..84125e5 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,15 +31,15 @@ public final class LayoutTagged extends LayoutIndexedScope {
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkArgument(edit.get().index >= 0);
         checkArgument(edit.get().scopeTypeArgs.getCount() > edit.get().index);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(edit.get().index).getType().LayoutCode);
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         TypeArgument[] retval = new TypeArgument[2];
         retval[0] = new TypeArgument(UInt8, TypeArgumentList.Empty);
         retval[1] = ReadTypeArgument(row, offset, lenInBytes);
@@ -46,14 +47,14 @@ public final class LayoutTagged extends LayoutIndexedScope {
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeTypeArgs.get(edit.get().index).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(edit.get().index).getTypeArgs().clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -61,8 +62,8 @@ public final class LayoutTagged extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -74,7 +75,7 @@ public final class LayoutTagged extends LayoutIndexedScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkArgument(value.getCount() == 2);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged2.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged2.java
index 2422be3..7e6c781 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged2.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTagged2.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -35,21 +35,21 @@ public final class LayoutTagged2 extends LayoutIndexedScope {
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkState(edit.get().index >= 0);
         checkState(edit.get().scopeTypeArgs.getCount() > edit.get().index);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(edit.get().index).getType().LayoutCode);
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         lenInBytes.set(0);
         TypeArgument[] retval = new TypeArgument[3];
         retval[0] = new TypeArgument(UInt8, TypeArgumentList.Empty);
         for (int i = 1; i < 3; i++) {
             int itemLenInBytes;
-            OutObject<Integer> tempOut_itemLenInBytes = new OutObject<Integer>();
+            Out<Integer> tempOut_itemLenInBytes = new Out<Integer>();
             retval[i] = ReadTypeArgument(row, offset + lenInBytes.get(), tempOut_itemLenInBytes);
             itemLenInBytes = tempOut_itemLenInBytes.get();
             lenInBytes.set(lenInBytes.get() + itemLenInBytes);
@@ -59,14 +59,14 @@ public final class LayoutTagged2 extends LayoutIndexedScope {
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeTypeArgs.get(edit.get().index).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(edit.get().index).getTypeArgs().clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -74,8 +74,8 @@ public final class LayoutTagged2 extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -87,7 +87,7 @@ public final class LayoutTagged2 extends LayoutIndexedScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkState(value.getCount() == 3);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTuple.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTuple.java
index 0b96666..6c25cf1 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTuple.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTuple.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -37,13 +38,13 @@ public final class LayoutTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         int numTypeArgs = row.get().intValue().Read7BitEncodedUInt(offset, lenInBytes);
         TypeArgument[] retval = new TypeArgument[numTypeArgs];
         for (int i = 0; i < numTypeArgs; i++) {
             int itemLenInBytes;
-            OutObject<Integer> tempOut_itemLenInBytes = new OutObject<Integer>();
+            Out<Integer> tempOut_itemLenInBytes = new Out<Integer>();
             retval[i] = ReadTypeArgument(row, offset + lenInBytes.get(), tempOut_itemLenInBytes);
             itemLenInBytes = tempOut_itemLenInBytes.get();
             lenInBytes.set(lenInBytes.get() + itemLenInBytes);
@@ -53,8 +54,8 @@ public final class LayoutTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -62,8 +63,8 @@ public final class LayoutTuple extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -75,7 +76,7 @@ public final class LayoutTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType.java
index 2824d8d..b44a561 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -27,7 +28,7 @@ import static com.google.common.base.Strings.lenientFormat;
 
 /**
  * The abstract base class for typed hybrid row field descriptors.
- * <see cref="LayoutType" /> is immutable.
+ * {@link LayoutType} is immutable.
  */
 // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
 //ORIGINAL LINE: [DebuggerDisplay("{" + nameof(LayoutType.Name) + "}")] public abstract class LayoutType : ILayoutType
@@ -269,7 +270,7 @@ public abstract class LayoutType implements ILayoutType {
     public int Size;
 
     /**
-     * Initializes a new instance of the <see cref="LayoutType" /> class.
+     * Initializes a new instance of the {@link LayoutType} class.
      */
     public LayoutType(LayoutCode code, boolean immutable, int size) {
         this.LayoutCode = code;
@@ -343,7 +344,7 @@ public abstract class LayoutType implements ILayoutType {
      * @param code The expected type of the field.
      * @return Success if the delete is permitted, the error code otherwise.
      */
-    public static Result PrepareSparseDelete(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public static Result PrepareSparseDelete(Reference<RowBuffer> b, Reference<RowCursor> edit,
                                              LayoutCode code) {
         if (edit.get().scopeType.IsFixedArity) {
             return Result.TypeConstraint;
@@ -373,11 +374,11 @@ public abstract class LayoutType implements ILayoutType {
      * @return Success if the move is permitted, the error code otherwise.
      * The source field is delete if the move prepare fails with a destination error.
      */
-    public static Result PrepareSparseMove(RefObject<RowBuffer> b,
-                                           RefObject<RowCursor> destinationScope,
+    public static Result PrepareSparseMove(Reference<RowBuffer> b,
+                                           Reference<RowCursor> destinationScope,
                                            LayoutScope destinationCode, TypeArgument elementType,
-                                           RefObject<RowCursor> srcEdit, UpdateOptions options,
-                                           OutObject<RowCursor> dstEdit) {
+                                           Reference<RowCursor> srcEdit, UpdateOptions options,
+                                           Out<RowCursor> dstEdit) {
         checkArgument(destinationScope.get().scopeType == destinationCode);
         checkArgument(destinationScope.get().index == 0, "Can only insert into a edit at the root");
 
@@ -436,7 +437,7 @@ public abstract class LayoutType implements ILayoutType {
      * @param code The expected type of the field.
      * @return Success if the read is permitted, the error code otherwise.
      */
-    public static Result PrepareSparseRead(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public static Result PrepareSparseRead(Reference<RowBuffer> b, Reference<RowCursor> edit,
                                            LayoutCode code) {
         if (!edit.get().exists) {
             return Result.NotFound;
@@ -458,7 +459,7 @@ public abstract class LayoutType implements ILayoutType {
      * @param options The write options.
      * @return Success if the write is permitted, the error code otherwise.
      */
-    public static Result PrepareSparseWrite(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
+    public static Result PrepareSparseWrite(Reference<RowBuffer> b, Reference<RowCursor> edit,
                                             TypeArgument typeArg, UpdateOptions options) {
         if (edit.get().immutable || (edit.get().scopeType.IsUniqueScope && !edit.get().deferUniqueIndex)) {
             return Result.InsufficientPermissions;
@@ -497,17 +498,17 @@ public abstract class LayoutType implements ILayoutType {
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [MethodImpl(MethodImplOptions.AggressiveInlining)] internal static TypeArgument ReadTypeArgument(ref RowBuffer row, int offset, out int lenInBytes)
-    public static TypeArgument ReadTypeArgument(RefObject<RowBuffer> row, int offset, OutObject<Integer> lenInBytes) {
+    public static TypeArgument ReadTypeArgument(Reference<RowBuffer> row, int offset, Out<Integer> lenInBytes) {
         LayoutType itemCode = row.get().ReadSparseTypeCode(offset);
         int argsLenInBytes;
-        OutObject<Integer> tempOut_argsLenInBytes = new OutObject<Integer>();
+        Out<Integer> tempOut_argsLenInBytes = new Out<Integer>();
         TypeArgumentList itemTypeArgs = itemCode.ReadTypeArgumentList(row, offset + (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE), tempOut_argsLenInBytes).clone();
         argsLenInBytes = tempOut_argsLenInBytes.get();
         lenInBytes.set((com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE) + argsLenInBytes);
         return new TypeArgument(itemCode, itemTypeArgs.clone());
     }
 
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset, OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset, Out<Integer> lenInBytes) {
         lenInBytes.set(0);
         return TypeArgumentList.Empty;
     }
@@ -521,7 +522,7 @@ public abstract class LayoutType implements ILayoutType {
         return (T)this;
     }
 
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         return (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType1.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType1.java
index 3741f0a..6233464 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType1.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutType1.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -17,11 +18,11 @@ import static com.google.common.base.Preconditions.checkArgument;
  * <typeparamref name="T" />.
  *
  *
- * <see cref="LayoutType{T}" /> is an immutable, stateless, helper class.  It provides
+ * {@link LayoutType{T}} is an immutable, stateless, helper class.  It provides
  * methods for manipulating hybrid row fields of a particular type, and properties that describe the
  * layout of fields of that type.
  * <para />
- * <see cref="LayoutType{T}" /> is immutable.
+ * {@link LayoutType{T}} is immutable.
  */
 public abstract class LayoutType<T> extends LayoutType {
     private TypeArgument typeArg = new TypeArgument();
@@ -31,7 +32,7 @@ public abstract class LayoutType<T> extends LayoutType {
         this.typeArg = new TypeArgument(this);
     }
 
-    public final Result DeleteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public final Result DeleteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                     LayoutColumn col) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -53,7 +54,7 @@ public abstract class LayoutType<T> extends LayoutType {
      * If a value exists, then it is removed.  The remainder of the row is resized to accomodate
      * a decrease in required space.  If no value exists this operation is a no-op.
      */
-    public final Result DeleteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit) {
+    public final Result DeleteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit) {
         Result result = LayoutType.PrepareSparseDelete(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             return result;
@@ -69,7 +70,7 @@ public abstract class LayoutType<T> extends LayoutType {
      * If a value exists, then it is removed.  The remainder of the row is resized to accomodate
      * a decrease in required space.  If no value exists this operation is a no-op.
      */
-    public final Result DeleteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public final Result DeleteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                        LayoutColumn col) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -87,7 +88,7 @@ public abstract class LayoutType<T> extends LayoutType {
         return Result.Success;
     }
 
-    public final Result HasValue(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public final Result HasValue(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                  LayoutColumn col) {
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             return Result.NotFound;
@@ -96,28 +97,28 @@ public abstract class LayoutType<T> extends LayoutType {
         return Result.Success;
     }
 
-    public abstract Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                                     LayoutColumn col, OutObject<T> value);
+    public abstract Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope,
+                                     LayoutColumn col, Out<T> value);
 
-    public abstract Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, OutObject<T> value);
+    public abstract Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Out<T> value);
 
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col
-        , OutObject<T> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col
+        , Out<T> value) {
         value.set(null);
         return Result.Failure;
     }
 
-    public abstract Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public abstract Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                       LayoutColumn col, T value);
 
-    public abstract Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, T value);
+    public abstract Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, T value);
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public abstract Result WriteSparse(ref RowBuffer b, ref RowCursor edit, T value, UpdateOptions
     // options = UpdateOptions.Upsert);
-    public abstract Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, T value, UpdateOptions options);
+    public abstract Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, T value, UpdateOptions options);
 
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, T value) {
         return Result.Failure;
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedArray.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedArray.java
index fe8766c..0f6470c 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedArray.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedArray.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,27 +29,27 @@ public final class LayoutTypedArray extends LayoutIndexedScope {
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkState(edit.get().index >= 0);
         checkState(edit.get().scopeTypeArgs.getCount() == 1);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(0).getType().LayoutCode);
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         return new TypeArgumentList(new TypeArgument[] { LayoutType.ReadTypeArgument(row, offset, lenInBytes) });
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeTypeArgs.get(0).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(0).getTypeArgs().clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -56,8 +57,8 @@ public final class LayoutTypedArray extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -69,7 +70,7 @@ public final class LayoutTypedArray extends LayoutIndexedScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkState(value.getCount() == 1);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedMap.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedMap.java
index 38f56cf..b67a985 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedMap.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedMap.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -34,24 +35,24 @@ public final class LayoutTypedMap extends LayoutUniqueScope {
     }
 
     @Override
-    public TypeArgument FieldType(RefObject<RowCursor> scope) {
+    public TypeArgument FieldType(Reference<RowCursor> scope) {
         return new TypeArgument(scope.get().scopeType.Immutable ? ImmutableTypedTuple :
             TypedTuple, scope.get().scopeTypeArgs.clone());
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         return true;
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         lenInBytes.set(0);
         TypeArgument[] retval = new TypeArgument[2];
         for (int i = 0; i < 2; i++) {
             int itemLenInBytes;
-            OutObject<Integer> tempOut_itemLenInBytes = new OutObject<Integer>();
+            Out<Integer> tempOut_itemLenInBytes = new Out<Integer>();
             retval[i] = ReadTypeArgument(row, offset + lenInBytes.get(), tempOut_itemLenInBytes);
             itemLenInBytes = tempOut_itemLenInBytes.get();
             lenInBytes.set(lenInBytes.get() + itemLenInBytes);
@@ -61,15 +62,15 @@ public final class LayoutTypedMap extends LayoutUniqueScope {
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeType.Immutable ? ImmutableTypedTuple :
             TypedTuple;
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -77,8 +78,8 @@ public final class LayoutTypedMap extends LayoutUniqueScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -90,7 +91,7 @@ public final class LayoutTypedMap extends LayoutUniqueScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkState(value.getCount() == 2);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedSet.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedSet.java
index 6af4744..611de6f 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedSet.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedSet.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,32 +31,32 @@ public final class LayoutTypedSet extends LayoutUniqueScope {
     }
 
     @Override
-    public TypeArgument FieldType(RefObject<RowCursor> scope) {
+    public TypeArgument FieldType(Reference<RowCursor> scope) {
         return scope.get().scopeTypeArgs.get(0).clone();
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkState(edit.get().index >= 0);
         checkState(edit.get().scopeTypeArgs.getCount() == 1);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(0).getType().LayoutCode);
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         return new TypeArgumentList(new TypeArgument[] { ReadTypeArgument(row, offset, lenInBytes) });
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeTypeArgs.get(0).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(0).getTypeArgs().clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -63,8 +64,8 @@ public final class LayoutTypedSet extends LayoutUniqueScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -76,7 +77,7 @@ public final class LayoutTypedSet extends LayoutUniqueScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         checkArgument(value.getCount() == 1);
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedTuple.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedTuple.java
index 804a903..e649655 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedTuple.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypedTuple.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -37,20 +37,20 @@ public final class LayoutTypedTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public boolean HasImplicitTypeCode(RefObject<RowCursor> edit) {
+    public boolean HasImplicitTypeCode(Reference<RowCursor> edit) {
         checkArgument(edit.get().index >= 0);
         checkArgument(edit.get().scopeTypeArgs.getCount() > edit.get().index);
         return !LayoutCodeTraits.AlwaysRequiresTypeCode(edit.get().scopeTypeArgs.get(edit.get().index).getType().LayoutCode);
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         int numTypeArgs = row.get().intValue().Read7BitEncodedUInt(offset, lenInBytes);
         TypeArgument[] retval = new TypeArgument[numTypeArgs];
         for (int i = 0; i < numTypeArgs; i++) {
             int itemLenInBytes;
-            OutObject<Integer> tempOut_itemLenInBytes = new OutObject<Integer>();
+            Out<Integer> tempOut_itemLenInBytes = new Out<Integer>();
             retval[i] = LayoutType.ReadTypeArgument(row, offset + lenInBytes.get(), tempOut_itemLenInBytes);
             itemLenInBytes = tempOut_itemLenInBytes.get();
             lenInBytes.set(lenInBytes.get() + itemLenInBytes);
@@ -60,14 +60,14 @@ public final class LayoutTypedTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public void SetImplicitTypeCode(RefObject<RowCursor> edit) {
+    public void SetImplicitTypeCode(Reference<RowCursor> edit) {
         edit.get().cellType = edit.get().scopeTypeArgs.get(edit.get().index).getType();
         edit.get().cellTypeArgs = edit.get().scopeTypeArgs.get(edit.get().index).getTypeArgs().clone();
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -75,8 +75,8 @@ public final class LayoutTypedTuple extends LayoutIndexedScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
             value.set(null);
@@ -88,7 +88,7 @@ public final class LayoutTypedTuple extends LayoutIndexedScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         int lenInBytes = (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUDT.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUDT.java
index 24f5020..b0caeff 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUDT.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUDT.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,16 +29,16 @@ public final class LayoutUDT extends LayoutPropertyScope {
     }
 
     @Override
-    public TypeArgumentList ReadTypeArgumentList(RefObject<RowBuffer> row, int offset,
-                                                 OutObject<Integer> lenInBytes) {
+    public TypeArgumentList ReadTypeArgumentList(Reference<RowBuffer> row, int offset,
+                                                 Out<Integer> lenInBytes) {
         SchemaId schemaId = row.get().ReadSchemaId(offset).clone();
         lenInBytes.set(SchemaId.Size);
         return new TypeArgumentList(schemaId.clone());
     }
 
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value) {
         return WriteScope(b, edit, typeArgs, value, UpdateOptions.Upsert);
     }
 
@@ -45,8 +46,8 @@ public final class LayoutUDT extends LayoutPropertyScope {
     //ORIGINAL LINE: public override Result WriteScope(ref RowBuffer b, ref RowCursor edit, TypeArgumentList
     // typeArgs, out RowCursor value, UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             TypeArgumentList typeArgs, OutObject<RowCursor> value, UpdateOptions options) {
+    public Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             TypeArgumentList typeArgs, Out<RowCursor> value, UpdateOptions options) {
         Layout udt = b.get().getResolver().Resolve(typeArgs.getSchemaId().clone());
         Result result = PrepareSparseWrite(b, edit, new TypeArgument(this, typeArgs.clone()), options);
         if (result != Result.Success) {
@@ -59,7 +60,7 @@ public final class LayoutUDT extends LayoutPropertyScope {
     }
 
     @Override
-    public int WriteTypeArgument(RefObject<RowBuffer> row, int offset, TypeArgumentList value) {
+    public int WriteTypeArgument(Reference<RowBuffer> row, int offset, TypeArgumentList value) {
         row.get().WriteSparseTypeCode(offset, this.LayoutCode);
         row.get().WriteSchemaId(offset + (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE), value.getSchemaId().clone());
         return (com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.SIZE / Byte.SIZE) + SchemaId.Size;
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt16.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt16.java
index 6d02079..9d6d291 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt16.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt16.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,8 +34,8 @@ public final class LayoutUInt16 extends LayoutType<Short> {
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ushort value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Short> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Short> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -48,8 +49,8 @@ public final class LayoutUInt16 extends LayoutType<Short> {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out ushort value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Short> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Short> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -64,7 +65,7 @@ public final class LayoutUInt16 extends LayoutType<Short> {
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, ushort
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              short value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -81,7 +82,7 @@ public final class LayoutUInt16 extends LayoutType<Short> {
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, short value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, short value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -93,7 +94,7 @@ public final class LayoutUInt16 extends LayoutType<Short> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, short value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, short value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt32.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt32.java
index d9b90b4..78ee192 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt32.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt32.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,8 +34,8 @@ public final class LayoutUInt32 extends LayoutType<Integer> {
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // uint value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Integer> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Integer> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -48,8 +49,8 @@ public final class LayoutUInt32 extends LayoutType<Integer> {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out uint value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Integer> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Integer> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -64,7 +65,7 @@ public final class LayoutUInt32 extends LayoutType<Integer> {
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, uint
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              int value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -81,7 +82,7 @@ public final class LayoutUInt32 extends LayoutType<Integer> {
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, int value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, int value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -93,7 +94,7 @@ public final class LayoutUInt32 extends LayoutType<Integer> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, int value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, int value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt64.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt64.java
index 5ecfe88..7c0ab31 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt64.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt64.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,8 +34,8 @@ public final class LayoutUInt64 extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ulong value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Long> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Long> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -48,8 +49,8 @@ public final class LayoutUInt64 extends LayoutType<Long> {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out ulong value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Long> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Long> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -64,7 +65,7 @@ public final class LayoutUInt64 extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, ulong
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              long value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -81,7 +82,7 @@ public final class LayoutUInt64 extends LayoutType<Long> {
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -93,7 +94,7 @@ public final class LayoutUInt64 extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt8.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt8.java
index 15ac870..214f7dd 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt8.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUInt8.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,8 +34,8 @@ public final class LayoutUInt8 extends LayoutType<Byte> {
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // byte value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Byte> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Byte> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -48,8 +49,8 @@ public final class LayoutUInt8 extends LayoutType<Byte> {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out byte value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<Byte> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<Byte> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -64,7 +65,7 @@ public final class LayoutUInt8 extends LayoutType<Byte> {
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, byte
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              byte value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -81,7 +82,7 @@ public final class LayoutUInt8 extends LayoutType<Byte> {
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -93,7 +94,7 @@ public final class LayoutUInt8 extends LayoutType<Byte> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, byte value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, byte value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUniqueScope.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUniqueScope.java
index b0cbe55..6e035f8 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUniqueScope.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUniqueScope.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -21,7 +22,7 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
         super(code, immutable, isSizedScope, false, true, isTypedScope);
     }
 
-    public abstract TypeArgument FieldType(RefObject<RowCursor> scope);
+    public abstract TypeArgument FieldType(Reference<RowCursor> scope);
 
     /**
      * Search for a matching field within a unique index.
@@ -35,8 +36,8 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
      * <p>
      * The pattern field is delete whether the find succeeds or fails.
      */
-    public final Result Find(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
-                             RefObject<RowCursor> patternScope, OutObject<RowCursor> value) {
+    public final Result Find(Reference<RowBuffer> b, Reference<RowCursor> scope,
+                             Reference<RowCursor> patternScope, Out<RowCursor> value) {
         Result result = LayoutType.PrepareSparseMove(b, scope, this, this.FieldType(scope).clone(), patternScope, UpdateOptions.Update, value.clone());
 
         if (result != Result.Success) {
@@ -52,11 +53,11 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public Result MoveField(ref RowBuffer b, ref RowCursor destinationScope, ref RowCursor
     // sourceEdit, UpdateOptions options = UpdateOptions.Upsert)
-    public final Result MoveField(RefObject<RowBuffer> b, RefObject<RowCursor> destinationScope,
-                                  RefObject<RowCursor> sourceEdit, UpdateOptions options) {
+    public final Result MoveField(Reference<RowBuffer> b, Reference<RowCursor> destinationScope,
+                                  Reference<RowCursor> sourceEdit, UpdateOptions options) {
         RowCursor dstEdit;
-        OutObject<RowCursor> tempOut_dstEdit =
-            new OutObject<RowCursor>();
+        Out<RowCursor> tempOut_dstEdit =
+            new Out<RowCursor>();
         Result result = LayoutType.PrepareSparseMove(b, destinationScope, this,
             this.FieldType(destinationScope).clone(), sourceEdit, options, tempOut_dstEdit);
         dstEdit = tempOut_dstEdit.get();
@@ -66,10 +67,10 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
         }
 
         // Perform the move.
-        RefObject<RowCursor> tempRef_dstEdit =
-            new RefObject<RowCursor>(dstEdit);
-        b.get().TypedCollectionMoveField(tempRef_dstEdit, sourceEdit, RowOptions.forValue(options));
-        dstEdit = tempRef_dstEdit.get();
+        Reference<RowCursor> tempReference_dstEdit =
+            new Reference<RowCursor>(dstEdit);
+        b.get().TypedCollectionMoveField(tempReference_dstEdit, sourceEdit, RowOptions.forValue(options));
+        dstEdit = tempReference_dstEdit.get();
 
         // TODO: it would be "better" if the destinationScope were updated to point to the
         // highest item seen.  Then we would avoid the maximum reparse.
@@ -92,8 +93,8 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
      * The source field is delete whether the move succeeds or fails.
      */
 
-    public final Result MoveField(RefObject<RowBuffer> b, RefObject<RowCursor> destinationScope,
-                                  RefObject<RowCursor> sourceEdit) {
+    public final Result MoveField(Reference<RowBuffer> b, Reference<RowCursor> destinationScope,
+                                  Reference<RowCursor> sourceEdit) {
         return MoveField(b, destinationScope, sourceEdit, UpdateOptions.Upsert);
     }
 
@@ -102,12 +103,12 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
     // TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func, UpdateOptions options = UpdateOptions
     // .Upsert)
     @Override
-    public <TContext> Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public <TContext> Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                         TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func,
                                         UpdateOptions options) {
         RowCursor uniqueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.WriteScope(b, scope, typeArgs.clone(), out uniqueScope, options);
         if (r != Result.Success) {
             return r;
@@ -115,39 +116,39 @@ public abstract class LayoutUniqueScope extends LayoutIndexedScope {
 
         RowCursor childScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         uniqueScope.Clone(out childScope);
         childScope.deferUniqueIndex = true;
-        RefObject<RowCursor> tempRef_childScope =
-            new RefObject<RowCursor>(childScope);
+        Reference<RowCursor> tempReference_childScope =
+            new Reference<RowCursor>(childScope);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         r = func == null ? null : func.Invoke(ref b, ref childScope, context) ??Result.Success;
-        childScope = tempRef_childScope.get();
+        childScope = tempReference_childScope.get();
         if (r != Result.Success) {
             this.DeleteScope(b, scope);
             return r;
         }
 
         uniqueScope.count = childScope.count;
-        RefObject<RowCursor> tempRef_uniqueScope =
-            new RefObject<RowCursor>(uniqueScope);
-        r = b.get().TypedCollectionUniqueIndexRebuild(tempRef_uniqueScope);
-        uniqueScope = tempRef_uniqueScope.get();
+        Reference<RowCursor> tempReference_uniqueScope =
+            new Reference<RowCursor>(uniqueScope);
+        r = b.get().TypedCollectionUniqueIndexRebuild(tempReference_uniqueScope);
+        uniqueScope = tempReference_uniqueScope.get();
         if (r != Result.Success) {
             this.DeleteScope(b, scope);
             return r;
         }
 
-        RefObject<RowCursor> tempRef_childScope2 =
-            new RefObject<RowCursor>(childScope);
+        Reference<RowCursor> tempReference_childScope2 =
+            new Reference<RowCursor>(childScope);
         RowCursorExtensions.Skip(scope.get().clone(), b,
-            tempRef_childScope2);
-        childScope = tempRef_childScope2.get();
+            tempReference_childScope2);
+        childScope = tempReference_childScope2.get();
         return Result.Success;
     }
 
     @Override
-    public <TContext> Result WriteScope(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public <TContext> Result WriteScope(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                         TypeArgumentList typeArgs, TContext context, WriterFunc<TContext> func) {
         return WriteScope(b, scope, typeArgs, context, func, UpdateOptions.Upsert);
     }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUnixDateTime.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUnixDateTime.java
index 437e537..aaada2e 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUnixDateTime.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUnixDateTime.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -30,8 +31,8 @@ public final class LayoutUnixDateTime extends LayoutType<com.azure.data.cosmos.s
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<UnixDateTime> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<UnixDateTime> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -43,8 +44,8 @@ public final class LayoutUnixDateTime extends LayoutType<com.azure.data.cosmos.s
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<UnixDateTime> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<UnixDateTime> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -56,7 +57,7 @@ public final class LayoutUnixDateTime extends LayoutType<com.azure.data.cosmos.s
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              UnixDateTime value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -72,7 +73,7 @@ public final class LayoutUnixDateTime extends LayoutType<com.azure.data.cosmos.s
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, UnixDateTime value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, UnixDateTime value
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, UnixDateTime value
         , UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -84,7 +85,7 @@ public final class LayoutUnixDateTime extends LayoutType<com.azure.data.cosmos.s
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, UnixDateTime value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, UnixDateTime value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUtf8.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUtf8.java
index 24bcf25..1e72ee6 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUtf8.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutUtf8.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -28,19 +29,19 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<String> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<String> value) {
         Utf8Span span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.ReadFixed(b, scope, col, out span);
         value.set((r == Result.Success) ? span.toString() :)
         default
         return r;
     }
 
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Utf8Span> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Utf8Span> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         checkArgument(col.getSize() >= 0);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
@@ -53,18 +54,18 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit,
-                             OutObject<String> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit,
+                             Out<String> value) {
         Utf8Span span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.ReadSparse(b, edit, out span);
         value.set((r == Result.Success) ? span.toString() :)
         default
         return r;
     }
 
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, OutObject<Utf8Span> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Out<Utf8Span> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(null);
@@ -76,19 +77,19 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col
-        , OutObject<String> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col
+        , Out<String> value) {
         Utf8Span span;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = this.ReadVariable(b, scope, col, out span);
         value.set((r == Result.Success) ? span.toString() :)
         default
         return r;
     }
 
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col
-        , OutObject<Utf8Span> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col
+        , Out<Utf8Span> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(null);
@@ -102,13 +103,13 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              String value) {
         checkArgument(value != null);
         return this.WriteFixed(b, scope, col, Utf8Span.TranscodeUtf16(value));
     }
 
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              Utf8Span value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         checkArgument(col.getSize() >= 0);
@@ -123,7 +124,7 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, String value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, String value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 
@@ -131,21 +132,21 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, string value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, String value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, String value,
                               UpdateOptions options) {
         checkArgument(value != null);
         return this.WriteSparse(b, edit, Utf8Span.TranscodeUtf16(value), options);
     }
 
 
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Utf8Span value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Utf8Span value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public Result WriteSparse(ref RowBuffer b, ref RowCursor edit, Utf8Span value, UpdateOptions
     // options = UpdateOptions.Upsert)
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, Utf8Span value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Utf8Span value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -157,13 +158,13 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
     }
 
     @Override
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, String value) {
         checkArgument(value != null);
         return this.WriteVariable(b, scope, col, Utf8Span.TranscodeUtf16(value));
     }
 
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, Utf8Span value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -179,7 +180,7 @@ public final class LayoutUtf8 extends LayoutType<String> implements ILayoutUtf8S
         int varOffset = b.get().ComputeVariableValueOffset(scope.get().layout, scope.get().start,
             col.getOffset());
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         b.get().WriteVariableString(varOffset, value, exists, tempOut_shift);
         shift = tempOut_shift.get();
         b.get().SetBit(scope.get().start, col.getNullBit().clone());
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarInt.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarInt.java
index 5cf49e7..9ad5957 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarInt.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarInt.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -33,15 +33,15 @@ public final class LayoutVarInt extends LayoutType<Long> {
     }
 
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Long> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Long> value) {
         Contract.Fail("Not Implemented");
         value.set(0);
         return Result.Failure;
     }
 
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, OutObject<Long> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Out<Long> value) {
         Result result = LayoutType.PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -53,7 +53,7 @@ public final class LayoutVarInt extends LayoutType<Long> {
     }
 
     @Override
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col, OutObject<Long> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<Long> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -67,7 +67,7 @@ public final class LayoutVarInt extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              long value) {
         Contract.Fail("Not Implemented");
         return Result.Failure;
@@ -77,7 +77,7 @@ public final class LayoutVarInt extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result WriteSparse(ref RowBuffer b, ref RowCursor edit, long value,
     // UpdateOptions options = UpdateOptions.Upsert)
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value,
                               UpdateOptions options) {
         Result result = LayoutType.PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -89,12 +89,12 @@ public final class LayoutVarInt extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 
     @Override
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, long value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -105,7 +105,7 @@ public final class LayoutVarInt extends LayoutType<Long> {
         int varOffset = b.get().ComputeVariableValueOffset(scope.get().layout, scope.get().start,
             col.getOffset());
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         b.get().WriteVariableInt(varOffset, value, exists, tempOut_shift);
         shift = tempOut_shift.get();
         b.get().SetBit(scope.get().start, col.getNullBit().clone());
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarUInt.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarUInt.java
index 32d6fd0..0b482d2 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarUInt.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutVarUInt.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -38,8 +39,8 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result ReadFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ulong value)
     @Override
-    public Result ReadFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
-                            OutObject<Long> value) {
+    public Result ReadFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
+                            Out<Long> value) {
         Contract.Fail("Not Implemented");
         value.set(0);
         return Result.Failure;
@@ -48,7 +49,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public override Result ReadSparse(ref RowBuffer b, ref RowCursor edit, out ulong value)
     @Override
-    public Result ReadSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, OutObject<Long> value) {
+    public Result ReadSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, Out<Long> value) {
         Result result = PrepareSparseRead(b, edit, this.LayoutCode);
         if (result != Result.Success) {
             value.set(0);
@@ -63,7 +64,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result ReadVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, out
     // ulong value)
     @Override
-    public Result ReadVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col, OutObject<Long> value) {
+    public Result ReadVariable(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col, Out<Long> value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (!b.get().ReadBit(scope.get().start, col.getNullBit().clone())) {
             value.set(0);
@@ -80,7 +81,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result WriteFixed(ref RowBuffer b, ref RowCursor scope, LayoutColumn col, ulong
     // value)
     @Override
-    public Result WriteFixed(RefObject<RowBuffer> b, RefObject<RowCursor> scope, LayoutColumn col,
+    public Result WriteFixed(Reference<RowBuffer> b, Reference<RowCursor> scope, LayoutColumn col,
                              long value) {
         Contract.Fail("Not Implemented");
         return Result.Failure;
@@ -91,7 +92,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     // UpdateOptions options = UpdateOptions.Upsert)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value,
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value,
                               UpdateOptions options) {
         Result result = PrepareSparseWrite(b, edit, this.getTypeArg().clone(), options);
         if (result != Result.Success) {
@@ -103,7 +104,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     }
 
     @Override
-    public Result WriteSparse(RefObject<RowBuffer> b, RefObject<RowCursor> edit, long value) {
+    public Result WriteSparse(Reference<RowBuffer> b, Reference<RowCursor> edit, long value) {
         return WriteSparse(b, edit, value, UpdateOptions.Upsert);
     }
 
@@ -111,7 +112,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
     //ORIGINAL LINE: public override Result WriteVariable(ref RowBuffer b, ref RowCursor scope, LayoutColumn col,
     // ulong value)
     @Override
-    public Result WriteVariable(RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+    public Result WriteVariable(Reference<RowBuffer> b, Reference<RowCursor> scope,
                                 LayoutColumn col, long value) {
         checkArgument(scope.get().scopeType instanceof LayoutUDT);
         if (scope.get().immutable) {
@@ -122,7 +123,7 @@ public final class LayoutVarUInt extends LayoutType<Long> {
         int varOffset = b.get().ComputeVariableValueOffset(scope.get().layout, scope.get().start,
             col.getOffset());
         int shift;
-        OutObject<Integer> tempOut_shift = new OutObject<Integer>();
+        Out<Integer> tempOut_shift = new Out<Integer>();
         b.get().WriteVariableUInt(varOffset, value, exists, tempOut_shift);
         shift = tempOut_shift.get();
         b.get().SetBit(scope.get().start, col.getNullBit().clone());
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/StringTokenizer.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/StringTokenizer.java
index 48b5edc..464539e 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/StringTokenizer.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/StringTokenizer.java
@@ -4,7 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,7 +21,7 @@ public final class StringTokenizer {
     private HashMap<Utf8String, StringToken> tokens;
 
     /**
-     * Initializes a new instance of the <see cref="StringTokenizer" /> class.
+     * Initializes a new instance of the {@link StringTokenizer} class.
      */
     public StringTokenizer() {
         this.tokens = new HashMap<Utf8String, StringToken>(Map.ofEntries(Map.entry(Utf8String.Empty,
@@ -68,7 +68,7 @@ public final class StringTokenizer {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public bool TryFindString(ulong token, out Utf8String path)
-    public boolean TryFindString(long token, OutObject<Utf8String> path) {
+    public boolean TryFindString(long token, Out<Utf8String> path) {
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: if (token >= (ulong)this.strings.Count)
         if (token >= (long)this.strings.size()) {
@@ -87,7 +87,7 @@ public final class StringTokenizer {
      * @param token If successful, the string's assigned token.
      * @return True if successful, false otherwise.
      */
-    public boolean TryFindToken(UtfAnyString path, OutObject<StringToken> token) {
+    public boolean TryFindToken(UtfAnyString path, Out<StringToken> token) {
         if (path.IsNull) {
             token.set(null);
             return false;
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgument.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgument.java
index 8cb7b45..9044aff 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgument.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgument.java
@@ -19,7 +19,7 @@ public final class TypeArgument implements IEquatable<TypeArgument> {
     private TypeArgumentList typeArgs = new TypeArgumentList();
 
     /**
-     * Initializes a new instance of the <see cref="TypeArgument" /> struct.
+     * Initializes a new instance of the {@link TypeArgument} struct.
      *
      * @param type The type of the constraint.
      */
@@ -34,7 +34,7 @@ public final class TypeArgument implements IEquatable<TypeArgument> {
     }
 
     /**
-     * Initializes a new instance of the <see cref="TypeArgument" /> struct.
+     * Initializes a new instance of the {@link TypeArgument} struct.
      *
      * @param type     The type of the constraint.
      * @param typeArgs For generic types the type parameters.
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgumentList.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgumentList.java
index 1439b7a..c448f23 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgumentList.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/TypeArgumentList.java
@@ -41,7 +41,7 @@ public final class TypeArgumentList implements IEquatable<TypeArgumentList> {
     }
 
     /**
-     * Initializes a new instance of the <see cref="TypeArgumentList" /> struct.
+     * Initializes a new instance of the {@link TypeArgumentList} struct.
      *
      * @param schemaId For UDT fields, the schema id of the nested layout.
      */
@@ -141,7 +141,7 @@ public final class TypeArgumentList implements IEquatable<TypeArgumentList> {
     }
 
     /**
-     * Enumerates the elements of a <see cref="TypeArgumentList" />.
+     * Enumerates the elements of a {@link TypeArgumentList}.
      */
     //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may
     // differ from the original:
@@ -157,7 +157,7 @@ public final class TypeArgumentList implements IEquatable<TypeArgumentList> {
         private TypeArgument[] list;
 
         /**
-         * Initializes a new instance of the <see cref="Enumerator" /> struct.
+         * Initializes a new instance of the {@link Enumerator} struct.
          *
          * @param list The list to enumerate.
          */
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/UpdateOptions.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/UpdateOptions.java
index 412d559..6f89610 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/UpdateOptions.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/UpdateOptions.java
@@ -5,7 +5,7 @@
 package com.azure.data.cosmos.serialization.hybridrow.layouts;
 
 /**
- * Describes the desired behavior when writing a <see cref="LayoutType" />.
+ * Describes the desired behavior when writing a {@link LayoutType}.
  */
 public enum UpdateOptions {
     None(0),
@@ -31,8 +31,8 @@ public enum UpdateOptions {
     /**
      * Update an existing value or insert a new value, if no value exists.
      * <p>
-     * If a value exists, then this operation becomes <see cref="Update" />, otherwise it becomes
-     * <see cref="Insert" />.
+     * If a value exists, then this operation becomes {@link Update}, otherwise it becomes
+     * {@link Insert}.
      */
     Upsert(3),
 
@@ -40,7 +40,7 @@ public enum UpdateOptions {
      * Insert a new value moving existing values to the right.
      * <p>
      * Within an array scope, inserts a new value immediately at the index moving all subsequent
-     * items to the right. In any other scope behaves the same as <see cref="Upsert" />.
+     * items to the right. In any other scope behaves the same as {@link Upsert}.
      */
     InsertAt(4);
 
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOFormatter.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOFormatter.java
index 6245a57..73c4e84 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOFormatter.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOFormatter.java
@@ -4,7 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.recordio;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowHeader;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.ISpanResizer;
@@ -15,7 +15,7 @@ public final class RecordIOFormatter {
     public static final Layout RecordLayout = SystemSchema.LayoutResolver.Resolve(SystemSchema.RecordSchemaId);
     public static final Layout SegmentLayout = SystemSchema.LayoutResolver.Resolve(SystemSchema.SegmentSchemaId);
 
-    public static Result FormatRecord(ReadOnlyMemory<Byte> body, OutObject<RowBuffer> row) {
+    public static Result FormatRecord(ReadOnlyMemory<Byte> body, Out<RowBuffer> row) {
         return FormatRecord(body, row, null);
     }
 
@@ -23,7 +23,7 @@ public final class RecordIOFormatter {
     //ORIGINAL LINE: public static Result FormatRecord(ReadOnlyMemory<byte> body, out RowBuffer row,
     // ISpanResizer<byte> resizer = default)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    public static Result FormatRecord(ReadOnlyMemory<Byte> body, OutObject<RowBuffer> row,
+    public static Result FormatRecord(ReadOnlyMemory<Byte> body, Out<RowBuffer> row,
                                       ISpanResizer<Byte> resizer) {
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: resizer = resizer != null ? resizer : DefaultSpanResizer<byte>.Default;
@@ -37,7 +37,7 @@ public final class RecordIOFormatter {
             RecordSerializer.Write, row.clone());
     }
 
-    public static Result FormatSegment(Segment segment, OutObject<RowBuffer> row) {
+    public static Result FormatSegment(Segment segment, Out<RowBuffer> row) {
         return FormatSegment(segment, row, null);
     }
 
@@ -45,7 +45,7 @@ public final class RecordIOFormatter {
     //ORIGINAL LINE: public static Result FormatSegment(Segment segment, out RowBuffer row, ISpanResizer<byte>
     // resizer = default)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
-    public static Result FormatSegment(Segment segment, OutObject<RowBuffer> row, ISpanResizer<Byte> resizer) {
+    public static Result FormatSegment(Segment segment, Out<RowBuffer> row, ISpanResizer<Byte> resizer) {
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: resizer = resizer != null ? resizer : DefaultSpanResizer<byte>.Default;
         resizer = resizer != null ? resizer : DefaultSpanResizer < Byte >.Default;
@@ -62,7 +62,7 @@ public final class RecordIOFormatter {
     //ORIGINAL LINE: private static Result FormatObject<T>(ISpanResizer<byte> resizer, int initialCapacity, Layout
     // layout, T obj, RowWriter.WriterFunc<T> writer, out RowBuffer row)
     private static <T> Result FormatObject(ISpanResizer<Byte> resizer, int initialCapacity, Layout layout, T obj,
-                                           RowWriter.WriterFunc<T> writer, OutObject<RowBuffer> row) {
+                                           RowWriter.WriterFunc<T> writer, Out<RowBuffer> row) {
         row.set(new RowBuffer(initialCapacity, resizer));
         row.get().InitLayout(HybridRowVersion.V1, layout, SystemSchema.LayoutResolver);
         Result r = RowWriter.WriteBuffer(row.clone(), obj, writer);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOParser.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOParser.java
index c4ca04f..3e0a99e 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOParser.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOParser.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.recordio;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowHeader;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -47,9 +48,9 @@ public final class RecordIOParser {
      *                 recommended that Process not be called again until at least this number of bytes are available.
      * @param consumed The number of bytes consumed from the input buffer. This number may be less
      *                 than the total buffer size if the parser moved to a new state.
-     * @return <see cref="azure.data.cosmos.serialization.hybridrow.Result.Success" /> if no error
+     * @return {@link azure.data.cosmos.serialization.hybridrow.Result.Success} if no error
      * has occurred, otherwise a valid
-     * <see cref="azure.data.cosmos.serialization.hybridrow.Result" /> of the last error encountered
+     * {@link azure.data.cosmos.serialization.hybridrow.Result} of the last error encountered
      * during parsing.
      * <p>
      * >
@@ -57,9 +58,9 @@ public final class RecordIOParser {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public Result Process(Memory<byte> buffer, out ProductionType type, out Memory<byte> record, out
     // int need, out int consumed)
-    public Result Process(Memory<Byte> buffer, OutObject<ProductionType> type,
-                          OutObject<Memory<Byte>> record, OutObject<Integer> need,
-                          OutObject<Integer> consumed) {
+    public Result Process(Memory<Byte> buffer, Out<ProductionType> type,
+                          Out<Memory<Byte>> record, Out<Integer> need,
+                          Out<Integer> consumed) {
         Result r = Result.Failure;
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Memory<byte> b = buffer;
@@ -82,17 +83,17 @@ public final class RecordIOParser {
                 //ORIGINAL LINE: Span<byte> span = b.Span.Slice(0, minimalSegmentRowSize);
                 Span<Byte> span = b.Span.Slice(0, minimalSegmentRowSize);
                 RowBuffer row = new RowBuffer(span, HybridRowVersion.V1, SystemSchema.LayoutResolver);
-                RefObject<RowBuffer> tempRef_row =
-                    new RefObject<RowBuffer>(row);
-                RowReader reader = new RowReader(tempRef_row);
-                row = tempRef_row.get();
-                RefObject<RowReader> tempRef_reader =
-                    new RefObject<RowReader>(reader);
-                OutObject<Segment> tempOut_segment =
-                    new OutObject<Segment>();
-                r = SegmentSerializer.Read(tempRef_reader, tempOut_segment);
+                Reference<RowBuffer> tempReference_row =
+                    new Reference<RowBuffer>(row);
+                RowReader reader = new RowReader(tempReference_row);
+                row = tempReference_row.get();
+                Reference<RowReader> tempReference_reader =
+                    new Reference<RowReader>(reader);
+                Out<Segment> tempOut_segment =
+                    new Out<Segment>();
+                r = SegmentSerializer.Read(tempReference_reader, tempOut_segment);
                 this.segment = tempOut_segment.get();
-                reader = tempRef_reader.get();
+                reader = tempReference_reader.get();
                 if (r != Result.Success) {
                     break;
                 }
@@ -113,17 +114,17 @@ public final class RecordIOParser {
                 //ORIGINAL LINE: Span<byte> span = b.Span.Slice(0, this.segment.Length);
                 Span<Byte> span = b.Span.Slice(0, this.segment.Length);
                 RowBuffer row = new RowBuffer(span, HybridRowVersion.V1, SystemSchema.LayoutResolver);
-                RefObject<RowBuffer> tempRef_row2 =
-                    new RefObject<RowBuffer>(row);
-                RowReader reader = new RowReader(tempRef_row2);
-                row = tempRef_row2.get();
-                RefObject<RowReader> tempRef_reader2 =
-                    new RefObject<RowReader>(reader);
-                OutObject<Segment> tempOut_segment2
-                    = new OutObject<Segment>();
-                r = SegmentSerializer.Read(tempRef_reader2, tempOut_segment2);
+                Reference<RowBuffer> tempReference_row2 =
+                    new Reference<RowBuffer>(row);
+                RowReader reader = new RowReader(tempReference_row2);
+                row = tempReference_row2.get();
+                Reference<RowReader> tempReference_reader2 =
+                    new Reference<RowReader>(reader);
+                Out<Segment> tempOut_segment2
+                    = new Out<Segment>();
+                r = SegmentSerializer.Read(tempReference_reader2, tempOut_segment2);
                 this.segment = tempOut_segment2.get();
-                reader = tempRef_reader2.get();
+                reader = tempReference_reader2.get();
                 if (r != Result.Success) {
                     break;
                 }
@@ -146,7 +147,7 @@ public final class RecordIOParser {
 
                 HybridRowHeader header;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 MemoryMarshal.TryRead(b.Span, out header);
                 if (header.Version != HybridRowVersion.V1) {
@@ -182,15 +183,15 @@ public final class RecordIOParser {
                 //ORIGINAL LINE: Span<byte> span = b.Span.Slice(0, minimalRecordRowSize);
                 Span<Byte> span = b.Span.Slice(0, minimalRecordRowSize);
                 RowBuffer row = new RowBuffer(span, HybridRowVersion.V1, SystemSchema.LayoutResolver);
-                RefObject<RowBuffer> tempRef_row3 =
-                    new RefObject<RowBuffer>(row);
-                RowReader reader = new RowReader(tempRef_row3);
-                row = tempRef_row3.get();
-                RefObject<RowReader> tempRef_reader3 = new RefObject<RowReader>(reader);
-                OutObject<Record> tempOut_record = new OutObject<Record>();
-                r = RecordSerializer.Read(tempRef_reader3, tempOut_record);
+                Reference<RowBuffer> tempReference_row3 =
+                    new Reference<RowBuffer>(row);
+                RowReader reader = new RowReader(tempReference_row3);
+                row = tempReference_row3.get();
+                Reference<RowReader> tempReference_reader3 = new Reference<RowReader>(reader);
+                Out<Record> tempOut_record = new Out<Record>();
+                r = RecordSerializer.Read(tempReference_reader3, tempOut_record);
                 this.record = tempOut_record.get();
-                reader = tempRef_reader3.get();
+                reader = tempReference_reader3.get();
                 if (r != Result.Success) {
                     break;
                 }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOStream.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOStream.java
index f0866bd..b990d74 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOStream.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordIOStream.java
@@ -4,7 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.recordio;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
 import com.azure.data.cosmos.serialization.hybridrow.MemorySpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -33,7 +33,7 @@ public final class RecordIOStream {
      * @param stm          The stream to read from.
      * @param visitRecord  A (required) delegate that is called once for each record.
      *                     <p>
-     *                     <paramref name="visitRecord" /> is passed a <see cref="Memory{T}" /> of the byte sequence
+     *                     <paramref name="visitRecord" /> is passed a {@link Memory{T}} of the byte sequence
      *                     of the
      *                     record body's row buffer.
      *                     </p>
@@ -45,7 +45,7 @@ public final class RecordIOStream {
      *                     over.
      *                     </p>
      *                     <p>
-     *                     <paramref name="visitSegment" /> is passed a <see cref="Memory{T}" /> of the byte sequence of
+     *                     <paramref name="visitSegment" /> is passed a {@link Memory{T}} of the byte sequence of
      *                     the segment header's row buffer.
      *                     </p>
      *                     <p>If <paramref name="visitSegment" /> returns an error then the sequence is aborted.</p>
@@ -109,12 +109,12 @@ public final class RecordIOStream {
             while (avail.Length > 0) {
                 // Loop around processing available data until we don't have anymore
                 RecordIOParser.ProductionType prodType;
-                OutObject<RecordIOParser.ProductionType> tempOut_prodType = new OutObject<RecordIOParser.ProductionType>();
+                Out<RecordIOParser.ProductionType> tempOut_prodType = new Out<RecordIOParser.ProductionType>();
                 Memory<Byte> record;
-                OutObject<Memory<Byte>> tempOut_record = new OutObject<Memory<Byte>>();
-                OutObject<Integer> tempOut_need = new OutObject<Integer>();
+                Out<Memory<Byte>> tempOut_record = new Out<Memory<Byte>>();
+                Out<Integer> tempOut_need = new Out<Integer>();
                 int consumed;
-                OutObject<Integer> tempOut_consumed = new OutObject<Integer>();
+                Out<Integer> tempOut_consumed = new Out<Integer>();
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: Result r = parser.Process(avail, out RecordIOParser.ProductionType prodType, out
                 // Memory<byte> record, out need, out int consumed);
@@ -207,7 +207,7 @@ public final class RecordIOStream {
             segment.clone(), index ->
         {
             ReadOnlyMemory<Byte> buffer;
-            OutObject<ReadOnlyMemory<Byte>> tempOut_buffer = new OutObject<ReadOnlyMemory<Byte>>();
+            Out<ReadOnlyMemory<Byte>> tempOut_buffer = new Out<ReadOnlyMemory<Byte>>();
             buffer = tempOut_buffer.get();
             return new ValueTask<(Result, ReadOnlyMemory < Byte >) > ((r,buffer))
         }, resizer);
@@ -250,7 +250,7 @@ public final class RecordIOStream {
 
         // Write a RecordIO stream.
         Memory<Byte> metadata;
-        OutObject<Memory<Byte>> tempOut_metadata = new OutObject<Memory<Byte>>();
+        Out<Memory<Byte>> tempOut_metadata = new Out<Memory<Byte>>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: Result r = RecordIOStream.FormatSegment(segment, resizer, out Memory<byte> metadata);
         Result r = RecordIOStream.FormatSegment(segment.clone(), resizer, tempOut_metadata);
@@ -277,7 +277,7 @@ public final class RecordIOStream {
                 break;
             }
 
-            OutObject<Memory<Byte>> tempOut_metadata2 = new OutObject<Memory<Byte>>();
+            Out<Memory<Byte>> tempOut_metadata2 = new Out<Memory<Byte>>();
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: r = RecordIOStream.FormatRow(body, resizer, out metadata);
             r = RecordIOStream.FormatRow(body, resizer, tempOut_metadata2);
@@ -311,9 +311,9 @@ public final class RecordIOStream {
      */
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: private static Result FormatRow(ReadOnlyMemory<byte> body, MemorySpanResizer<byte> resizer, out Memory<byte> block)
-    private static Result FormatRow(ReadOnlyMemory<Byte> body, MemorySpanResizer<Byte> resizer, OutObject<Memory<Byte>> block) {
+    private static Result FormatRow(ReadOnlyMemory<Byte> body, MemorySpanResizer<Byte> resizer, Out<Memory<Byte>> block) {
         RowBuffer row;
-        OutObject<RowBuffer> tempOut_row = new OutObject<RowBuffer>();
+        Out<RowBuffer> tempOut_row = new Out<RowBuffer>();
         Result r = RecordIOFormatter.FormatRecord(body, tempOut_row, resizer);
         row = tempOut_row.get();
         if (r != Result.Success) {
@@ -337,10 +337,10 @@ public final class RecordIOStream {
     //ORIGINAL LINE: private static Result FormatSegment(Segment segment, MemorySpanResizer<byte> resizer, out
     // Memory<byte> block)
     private static Result FormatSegment(Segment segment, MemorySpanResizer<Byte> resizer,
-                                        OutObject<Memory<Byte>> block) {
+                                        Out<Memory<Byte>> block) {
         RowBuffer row;
-        OutObject<RowBuffer> tempOut_row =
-            new OutObject<RowBuffer>();
+        Out<RowBuffer> tempOut_row =
+            new Out<RowBuffer>();
         Result r = RecordIOFormatter.FormatSegment(segment.clone(), tempOut_row, resizer);
         row = tempOut_row.get();
         if (r != Result.Success) {
@@ -364,6 +364,6 @@ public final class RecordIOStream {
      */
     @FunctionalInterface
     public interface ProduceFunc {
-        Result invoke(long index, OutObject<ReadOnlyMemory<Byte>> buffer);
+        Result invoke(long index, Out<ReadOnlyMemory<Byte>> buffer);
     }
 }
\ No newline at end of file
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordSerializer.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordSerializer.java
index c3f5ae4..663dd42 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordSerializer.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/RecordSerializer.java
@@ -4,12 +4,13 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.recordio;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 
 public final class RecordSerializer {
-    public static Result Read(RefObject<RowReader> reader, OutObject<Record> obj) {
+    public static Result Read(Reference<RowReader> reader, Out<Record> obj) {
         obj.set(null);
         while (reader.get().Read()) {
             Result r;
@@ -17,7 +18,7 @@ public final class RecordSerializer {
             // TODO: use Path tokens here.
             switch (reader.get().getPath().toString()) {
                 case "length":
-                    OutObject<Integer> tempOut_Length = new OutObject<Integer>();
+                    Out<Integer> tempOut_Length = new Out<Integer>();
                     r = reader.get().ReadInt32(tempOut_Length);
                     obj.get().argValue.Length = tempOut_Length.get();
                     if (r != Result.Success) {
@@ -26,7 +27,7 @@ public final class RecordSerializer {
 
                     break;
                 case "crc32":
-                    OutObject<Integer> tempOut_Crc32 = new OutObject<Integer>();
+                    Out<Integer> tempOut_Crc32 = new Out<Integer>();
                     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                     //ORIGINAL LINE: r = reader.ReadUInt32(out obj.Crc32);
                     r = reader.get().ReadUInt32(tempOut_Crc32);
@@ -42,7 +43,7 @@ public final class RecordSerializer {
         return Result.Success;
     }
 
-    public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg, Record obj) {
+    public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg, Record obj) {
         Result r;
         r = writer.get().WriteInt32("length", obj.Length);
         if (r != Result.Success) {
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/SegmentSerializer.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/SegmentSerializer.java
index ec41de7..02fb0fc 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/SegmentSerializer.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/recordio/SegmentSerializer.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.recordio;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -14,20 +14,20 @@ import com.azure.data.cosmos.serialization.hybridrow.io.RowReader;
 public final class SegmentSerializer {
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: public static Result Read(Span<byte> span, LayoutResolver resolver, out Segment obj)
-    public static Result Read(Span<Byte> span, LayoutResolver resolver, OutObject<Segment> obj) {
+    public static Result Read(Span<Byte> span, LayoutResolver resolver, Out<Segment> obj) {
         RowBuffer row = new RowBuffer(span, HybridRowVersion.V1, resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row);
-        row = tempRef_row.get();
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
-        Result tempVar = SegmentSerializer.Read(tempRef_reader, obj.clone());
-        reader = tempRef_reader.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row);
+        row = tempReference_row.get();
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
+        Result tempVar = SegmentSerializer.Read(tempReference_reader, obj.clone());
+        reader = tempReference_reader.get();
         return tempVar;
     }
 
-    public static Result Read(RefObject<RowReader> reader, OutObject<Segment> obj) {
+    public static Result Read(Reference<RowReader> reader, Out<Segment> obj) {
         obj.set(null);
         while (reader.get().Read()) {
             Result r;
@@ -35,7 +35,7 @@ public final class SegmentSerializer {
             // TODO: use Path tokens here.
             switch (reader.get().getPath().toString()) {
                 case "length":
-                    OutObject<Integer> tempOut_Length = new OutObject<Integer>();
+                    Out<Integer> tempOut_Length = new Out<Integer>();
                     r = reader.get().ReadInt32(tempOut_Length);
                     obj.get().argValue.Length = tempOut_Length.get();
                     if (r != Result.Success) {
@@ -50,7 +50,7 @@ public final class SegmentSerializer {
 
                     break;
                 case "comment":
-                    OutObject<String> tempOut_Comment = new OutObject<String>();
+                    Out<String> tempOut_Comment = new Out<String>();
                     r = reader.get().ReadString(tempOut_Comment);
                     obj.get().argValue.Comment = tempOut_Comment.get();
                     if (r != Result.Success) {
@@ -59,7 +59,7 @@ public final class SegmentSerializer {
 
                     break;
                 case "sdl":
-                    OutObject<String> tempOut_SDL = new OutObject<String>();
+                    Out<String> tempOut_SDL = new Out<String>();
                     r = reader.get().ReadString(tempOut_SDL);
                     obj.get().argValue.SDL = tempOut_SDL.get();
                     if (r != Result.Success) {
@@ -73,7 +73,7 @@ public final class SegmentSerializer {
         return Result.Success;
     }
 
-    public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg, Segment obj) {
+    public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg, Segment obj) {
         Result r;
         if (obj.Comment != null) {
             r = writer.get().WriteString("comment", obj.Comment);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ArrayPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ArrayPropertyType.java
index e876a4b..dd8d7d1 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ArrayPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ArrayPropertyType.java
@@ -8,8 +8,8 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
  * Array properties represent an unbounded set of zero or more items.
  * <p>
  * Arrays may be typed or untyped.  Within typed arrays, all items MUST be the same type. The
- * type of items is specified via <see cref="Items" />. Typed arrays may be stored more efficiently
- * than untyped arrays. When <see cref="Items" /> is unspecified, the array is untyped and its items
+ * type of items is specified via {@link Items}. Typed arrays may be stored more efficiently
+ * than untyped arrays. When {@link Items} is unspecified, the array is untyped and its items
  * may be heterogeneous.
  */
 public class ArrayPropertyType extends ScopePropertyType {
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/MapPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/MapPropertyType.java
index a091416..6ae4c78 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/MapPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/MapPropertyType.java
@@ -10,10 +10,10 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
  * <p>
  * <p>
  * Maps are typed or untyped.  Within typed maps, all key MUST be the same type, and all
- * values MUST be the same type.  The type of both key and values is specified via <see cref="Keys" />
- * and <see cref="Values" /> respectively. Typed maps may be stored more efficiently than untyped
- * maps. When <see cref="Keys" /> or <see cref="Values" /> is unspecified or marked
- * <see cref="TypeKind.Any" />, the map is untyped and its key and/or values may be heterogeneous.
+ * values MUST be the same type.  The type of both key and values is specified via {@link Keys}
+ * and {@link Values} respectively. Typed maps may be stored more efficiently than untyped
+ * maps. When {@link Keys} or {@link Values} is unspecified or marked
+ * {@link TypeKind.Any}, the map is untyped and its key and/or values may be heterogeneous.
  */
 public class MapPropertyType extends ScopePropertyType {
     /**
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Namespace.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Namespace.java
index b9dd81a..5274567 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Namespace.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Namespace.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 //ORIGINAL LINE: [JsonObject] public class Namespace
 public class Namespace {
     /**
-     * The standard settings used by the JSON parser for interpreting <see cref="Namespace" />
+     * The standard settings used by the JSON parser for interpreting {@link Namespace}
      * documents.
      */
     private static final JsonSerializerSettings NamespaceParseSettings = new JsonSerializerSettings() {
@@ -35,12 +35,12 @@ public class Namespace {
     //ORIGINAL LINE: [JsonProperty(PropertyName = "version")] public SchemaLanguageVersion Version {get;set;}
     private SchemaLanguageVersion Version = SchemaLanguageVersion.values()[0];
     /**
-     * The set of schemas that make up the <see cref="Namespace" />.
+     * The set of schemas that make up the {@link Namespace}.
      */
     private ArrayList<Schema> schemas;
 
     /**
-     * Initializes a new instance of the <see cref="Namespace" /> class.
+     * Initializes a new instance of the {@link Namespace} class.
      */
     public Namespace() {
         this.setSchemas(new ArrayList<Schema>());
@@ -55,7 +55,7 @@ public class Namespace {
     }
 
     /**
-     * The set of schemas that make up the <see cref="Namespace" />.
+     * The set of schemas that make up the {@link Namespace}.
      * <p>
      * Namespaces may consist of zero or more table schemas along with zero or more UDT schemas.
      * Table schemas can only reference UDT schemas defined in the same namespace.  UDT schemas can
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ObjectPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ObjectPropertyType.java
index 6130b75..fbb98ca 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ObjectPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/ObjectPropertyType.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
  * Object properties map to multiple columns depending on the number of internal properties
  * within the defined object structure.  Object properties are provided as a convince in schema
  * design.  They are effectively equivalent to defining the same properties explicitly via
- * <see cref="PrimitivePropertyType" /> with nested property paths.
+ * {@link PrimitivePropertyType} with nested property paths.
  */
 public class ObjectPropertyType extends ScopePropertyType {
     /**
@@ -21,7 +21,7 @@ public class ObjectPropertyType extends ScopePropertyType {
     private ArrayList<Property> properties;
 
     /**
-     * Initializes a new instance of the <see cref="ObjectPropertyType" /> class.
+     * Initializes a new instance of the {@link ObjectPropertyType} class.
      */
     public ObjectPropertyType() {
         this.properties = new ArrayList<Property>();
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PartitionKey.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PartitionKey.java
index 14c2d56..5a9c002 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PartitionKey.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PartitionKey.java
@@ -10,7 +10,7 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
 public class PartitionKey {
     /**
      * The logical path of the referenced property.
-     * Partition keys MUST refer to properties defined within the same <see cref="Schema" />.
+     * Partition keys MUST refer to properties defined within the same {@link Schema}.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [JsonProperty(PropertyName = "path", Required = Required.Always)] public string Path {get;set;}
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PrimarySortKey.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PrimarySortKey.java
index 29018a3..7536313 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PrimarySortKey.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PrimarySortKey.java
@@ -11,7 +11,7 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
 public class PrimarySortKey {
     /**
      * The logical path of the referenced property.
-     * Primary keys MUST refer to properties defined within the same <see cref="Schema" />.
+     * Primary keys MUST refer to properties defined within the same {@link Schema}.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [JsonProperty(PropertyName = "direction", Required = Required.DisallowNull)] public
@@ -19,7 +19,7 @@ public class PrimarySortKey {
     private SortDirection Direction = SortDirection.values()[0];
     /**
      * The logical path of the referenced property.
-     * Primary keys MUST refer to properties defined within the same <see cref="Schema" />.
+     * Primary keys MUST refer to properties defined within the same {@link Schema}.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [JsonProperty(PropertyName = "path", Required = Required.Always)] public string Path {get;set;}
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PropertySchemaConverter.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PropertySchemaConverter.java
index 609bf27..01b9e8c 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PropertySchemaConverter.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/PropertySchemaConverter.java
@@ -9,7 +9,7 @@ import Newtonsoft.Json.Converters.*;
 import Newtonsoft.Json.Linq.*;
 
 /**
- * Helper class for parsing the polymorphic <see cref="PropertyType" /> subclasses from JSON.
+ * Helper class for parsing the polymorphic {@link PropertyType} subclasses from JSON.
  */
 public class PropertySchemaConverter extends JsonConverter {
     @Override
@@ -35,7 +35,7 @@ public class PropertySchemaConverter extends JsonConverter {
 
         JToken value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (!propSchema.TryGetValue("type", out value)) {
             throw new JsonSerializationException("Required \"type\" property missing.");
         }
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Schema.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Schema.java
index 8d95c4a..cd6cd74 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Schema.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/Schema.java
@@ -55,7 +55,7 @@ public class Schema {
     //ORIGINAL LINE: [JsonProperty(PropertyName = "id", Required = Required.Always)] public SchemaId SchemaId {get;set;}
     private com.azure.data.cosmos.serialization.hybridrow.SchemaId SchemaId = new SchemaId();
     /**
-     * The type of this schema.  This value MUST be <see cref="TypeKind.Schema" />.
+     * The type of this schema.  This value MUST be {@link TypeKind.Schema}.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [DefaultValue(TypeKind.Schema)][JsonProperty(PropertyName = "type", Required = Required
@@ -86,7 +86,7 @@ public class Schema {
     private ArrayList<StaticKey> staticKeys;
 
     /**
-     * Initializes a new instance of the <see cref="Schema" /> class.
+     * Initializes a new instance of the {@link Schema} class.
      */
     public Schema() {
         this.setType(TypeKind.Schema);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaHash.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaHash.java
index 455a6ae..1b7924d 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaHash.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaHash.java
@@ -16,8 +16,8 @@ public final class SchemaHash {
     //	default)
     //		{
     //			(ulong low, ulong high) hash = seed;
-    //			hash = MurmurHash3.Hash128(schema.SchemaId, hash);
-    //			hash = MurmurHash3.Hash128(schema.Type, hash);
+    //			hash = Murmur3Hash.Hash128(schema.SchemaId, hash);
+    //			hash = Murmur3Hash.Hash128(schema.Type, hash);
     //			hash = SchemaHash.ComputeHash(ns, schema.Options, hash);
     //			if (schema.PartitionKeys != null)
     //			{
@@ -59,12 +59,12 @@ public final class SchemaHash {
     //	seed = default)
     //		{
     //			(ulong low, ulong high) hash = seed;
-    //			hash = MurmurHash3.Hash128(options == null ? null : options.DisallowUnschematized ?? false, hash);
-    //			hash = MurmurHash3.Hash128(options == null ? null : options.EnablePropertyLevelTimestamp ?? false,
+    //			hash = Murmur3Hash.Hash128(options == null ? null : options.DisallowUnschematized ?? false, hash);
+    //			hash = Murmur3Hash.Hash128(options == null ? null : options.EnablePropertyLevelTimestamp ?? false,
     //			hash);
     //			if (options == null ? null : options.DisableSystemPrefix ?? false)
     //			{
-    //				hash = MurmurHash3.Hash128(true, hash);
+    //				hash = Murmur3Hash.Hash128(true, hash);
     //			}
     //
     //			return hash;
@@ -76,7 +76,7 @@ public final class SchemaHash {
     //		{
     //			Contract.Requires(p != null);
     //			(ulong low, ulong high) hash = seed;
-    //			hash = MurmurHash3.Hash128(p.Path, hash);
+    //			hash = Murmur3Hash.Hash128(p.Path, hash);
     //			hash = SchemaHash.ComputeHash(ns, p.PropertyType, hash);
     //			return hash;
     //		}
@@ -87,21 +87,21 @@ public final class SchemaHash {
     //		{
     //			Contract.Requires(p != null);
     //			(ulong low, ulong high) hash = seed;
-    //			hash = MurmurHash3.Hash128(p.Type, hash);
-    //			hash = MurmurHash3.Hash128(p.Nullable, hash);
+    //			hash = Murmur3Hash.Hash128(p.Type, hash);
+    //			hash = Murmur3Hash.Hash128(p.Nullable, hash);
     //			if (p.ApiType != null)
     //			{
-    //				hash = MurmurHash3.Hash128(p.ApiType, hash);
+    //				hash = Murmur3Hash.Hash128(p.ApiType, hash);
     //			}
     //
     //			switch (p)
     //			{
     //				case PrimitivePropertyType pp:
-    //					hash = MurmurHash3.Hash128(pp.Storage, hash);
-    //					hash = MurmurHash3.Hash128(pp.Length, hash);
+    //					hash = Murmur3Hash.Hash128(pp.Storage, hash);
+    //					hash = Murmur3Hash.Hash128(pp.Length, hash);
     //					break;
     //				case ScopePropertyType pp:
-    //					hash = MurmurHash3.Hash128(pp.Immutable, hash);
+    //					hash = Murmur3Hash.Hash128(pp.Immutable, hash);
     //					switch (p)
     //					{
     //						case ArrayPropertyType spp:
@@ -199,7 +199,7 @@ public final class SchemaHash {
     //			(ulong low, ulong high) hash = seed;
     //			if (key != null)
     //			{
-    //				hash = MurmurHash3.Hash128(key.Path, hash);
+    //				hash = Murmur3Hash.Hash128(key.Path, hash);
     //			}
     //
     //			return hash;
@@ -211,8 +211,8 @@ public final class SchemaHash {
     //			(ulong low, ulong high) hash = seed;
     //			if (key != null)
     //			{
-    //				hash = MurmurHash3.Hash128(key.Path, hash);
-    //				hash = MurmurHash3.Hash128(key.Direction, hash);
+    //				hash = Murmur3Hash.Hash128(key.Path, hash);
+    //				hash = Murmur3Hash.Hash128(key.Direction, hash);
     //			}
     //
     //			return hash;
@@ -224,7 +224,7 @@ public final class SchemaHash {
     //			(ulong low, ulong high) hash = seed;
     //			if (key != null)
     //			{
-    //				hash = MurmurHash3.Hash128(key.Path, hash);
+    //				hash = Murmur3Hash.Hash128(key.Path, hash);
     //			}
     //
     //			return hash;
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaValidator.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaValidator.java
index 623c6ce..4889fd5 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaValidator.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SchemaValidator.java
@@ -165,7 +165,7 @@ HashMap<SchemaId, Schema> ids
 /**
      * Visit an entire namespace and validate its constraints.
      *
-     * @param ns      The <see cref="Namespace" /> to validate.
+     * @param ns      The {@link Namespace} to validate.
      * @param schemas A map from schema names within the namespace to their schemas.
      * @param ids     A map from schema ids within the namespace to their schemas.
      */
@@ -174,7 +174,7 @@ HashMap<SchemaId, Schema> ids
     /**
      * Visit a single schema and validate its constraints.
      *
-     * @param s       The <see cref="Schema" /> to validate.
+     * @param s       The {@link Schema} to validate.
      * @param schemas A map from schema names within the namespace to their schemas.
      * @param ids     A map from schema ids within the namespace to their schemas.
      */
@@ -263,7 +263,7 @@ private static void Visit(PropertyType p, PropertyType parent, HashMap<(String,
         }
 
         /**
-         * Validate <paramref name="id" /> is a valid <see cref="SchemaId" />.
+         * Validate <paramref name="id" /> is a valid {@link SchemaId}.
          *
          * @param id    The id to check.
          * @param label Diagnostic label describing <paramref name="id" />.
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SetPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SetPropertyType.java
index c53bca6..9a8a459 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SetPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/SetPropertyType.java
@@ -8,8 +8,8 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
  * Set properties represent an unbounded set of zero or more unique items.
  * <p>
  * Sets may be typed or untyped.  Within typed sets, all items MUST be the same type. The
- * type of items is specified via <see cref="Items" />. Typed sets may be stored more efficiently
- * than untyped sets. When <see cref="Items" /> is unspecified, the set is untyped and its items
+ * type of items is specified via {@link Items}. Typed sets may be stored more efficiently
+ * than untyped sets. When {@link Items} is unspecified, the set is untyped and its items
  * may be heterogeneous.
  * <p>
  * Each item within a set must be unique. Uniqueness is defined by the HybridRow encoded sequence
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StaticKey.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StaticKey.java
index eebe1b5..79eb5db 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StaticKey.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StaticKey.java
@@ -11,7 +11,7 @@ package com.azure.data.cosmos.serialization.hybridrow.schemas;
 public class StaticKey {
     /**
      * The logical path of the referenced property.
-     * Static path MUST refer to properties defined within the same <see cref="Schema" />.
+     * Static path MUST refer to properties defined within the same {@link Schema}.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [JsonProperty(PropertyName = "path", Required = Required.Always)] public string Path {get;set;}
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StorageKind.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StorageKind.java
index 3b98261..e4dea36 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StorageKind.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/StorageKind.java
@@ -13,9 +13,9 @@ public enum StorageKind {
     /**
      * The property defines a sparse column.
      * <p>
-     * Columns marked <see cref="Sparse" /> consume no space in the row when not present.  When
+     * Columns marked {@link Sparse} consume no space in the row when not present.  When
      * present they appear in an unordered linked list at the end of the row.  Access time for
-     * <see cref="Sparse" /> columns is proportional to the number of <see cref="Sparse" /> columns in the
+     * {@link Sparse} columns is proportional to the number of {@link Sparse} columns in the
      * row.
      */
     Sparse(0),
@@ -35,9 +35,9 @@ public enum StorageKind {
      * present it will also consume a variable number of bytes to encode the length preceding the actual
      * value.
      * <p>
-     * When a <em>long</em> value is marked <see cref="Variable" /> then a null-bit is reserved and
-     * the value is optionally encoded as <see cref="Variable" /> if small enough to fit, otherwise the
-     * null-bit is set and the value is encoded as <see cref="Sparse" />.
+     * When a <em>long</em> value is marked {@link Variable} then a null-bit is reserved and
+     * the value is optionally encoded as {@link Variable} if small enough to fit, otherwise the
+     * null-bit is set and the value is encoded as {@link Sparse}.
      * </p>
      */
     Variable(2);
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TaggedPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TaggedPropertyType.java
index 80767fc..3e86a2f 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TaggedPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TaggedPropertyType.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
  * Tagged properties pair one or more typed values with an API-specific uint8 type code.
  * <p>
  * The uint8 type code is implicitly in position 0 within the resulting tagged and should not
- * be specified in <see cref="Items" />.
+ * be specified in {@link Items}.
  */
 public class TaggedPropertyType extends ScopePropertyType {
     public static final int MaxTaggedArguments = 2;
@@ -21,7 +21,7 @@ public class TaggedPropertyType extends ScopePropertyType {
     private ArrayList<PropertyType> items;
 
     /**
-     * Initializes a new instance of the <see cref="TaggedPropertyType" /> class.
+     * Initializes a new instance of the {@link TaggedPropertyType} class.
      */
     public TaggedPropertyType() {
         this.items = new ArrayList<PropertyType>();
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TuplePropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TuplePropertyType.java
index cca95a4..a2d6324 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TuplePropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TuplePropertyType.java
@@ -16,7 +16,7 @@ public class TuplePropertyType extends ScopePropertyType {
     private ArrayList<PropertyType> items;
 
     /**
-     * Initializes a new instance of the <see cref="TuplePropertyType" /> class.
+     * Initializes a new instance of the {@link TuplePropertyType} class.
      */
     public TuplePropertyType() {
         this.items = new ArrayList<PropertyType>();
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TypeKind.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TypeKind.java
index 24a93dc..79b4df6 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TypeKind.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/TypeKind.java
@@ -115,19 +115,19 @@ public enum TypeKind {
     Float128(15),
 
     /**
-     * 128-bit floating point value.  See <see cref="decimal" />
+     * 128-bit floating point value.  See {@link decimal}
      */
     Decimal(16),
 
     /**
-     * 64-bit date/time value in 100ns increments from C# epoch.  See <see cref="System.DateTime" />
+     * 64-bit date/time value in 100ns increments from C# epoch.  See {@link System.DateTime}
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [EnumMember(Value = "datetime")] DateTime,
     DateTime(17),
 
     /**
-     * 64-bit date/time value in milliseconds increments from Unix epoch.  See <see cref="UnixDateTime" />
+     * 64-bit date/time value in milliseconds increments from Unix epoch.  See {@link UnixDateTime}
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //ORIGINAL LINE: [EnumMember(Value = "unixdatetime")] UnixDateTime,
@@ -193,7 +193,7 @@ public enum TypeKind {
 
     /**
      * An untyped sparse field.
-     * May only be used to define the type within a nested scope (e.g. <see cref="Object"/> or <see cref="Array"/>.
+     * May only be used to define the type within a nested scope (e.g. {@link Object} or {@link Array}.
      */
     Any(30);
 
diff --git a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/UdtPropertyType.java b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/UdtPropertyType.java
index 57be696..0f7f285 100644
--- a/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/UdtPropertyType.java
+++ b/jre/src/main/java/com/azure/data/cosmos/serialization/hybridrow/schemas/UdtPropertyType.java
@@ -17,7 +17,7 @@ public class UdtPropertyType extends ScopePropertyType {
     /**
      * The identifier of the UDT schema defining the structure for the nested row.
      * <p>
-     * The UDT schema MUST be defined within the same <see cref="Namespace" /> as the schema that
+     * The UDT schema MUST be defined within the same {@link Namespace} as the schema that
      * references it.
      */
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -26,9 +26,9 @@ public class UdtPropertyType extends ScopePropertyType {
     /**
      * The unique identifier for a schema.
      * <p>
-     * Optional uniquifier if multiple versions of <see cref="Name" /> appears within the Namespace.
+     * Optional uniquifier if multiple versions of {@link Name} appears within the Namespace.
      * <p>
-     * If multiple versions of a UDT are defined within the <see cref="Namespace" /> then the globally
+     * If multiple versions of a UDT are defined within the {@link Namespace} then the globally
      * unique identifier of the specific version referenced MUST be provided.
      * </p>
      */
diff --git a/jre/src/main/java/tangible/TryParseHelper.java b/jre/src/main/java/tangible/TryParseHelper.java
index a95fa0d..9dff830 100644
--- a/jre/src/main/java/tangible/TryParseHelper.java
+++ b/jre/src/main/java/tangible/TryParseHelper.java
@@ -4,7 +4,7 @@
 
 package tangible;
 
-import com.azure.data.cosmos.core.OutObject;
+import com.azure.data.cosmos.core.Out;
 
 //----------------------------------------------------------------------------------------
 //	Copyright © 2007 - 2019 Tangible Software Solutions, Inc.
@@ -13,7 +13,7 @@ import com.azure.data.cosmos.core.OutObject;
 //	This class is used to convert some of the C# TryParse methods to Java.
 //----------------------------------------------------------------------------------------
 public final class TryParseHelper {
-    public static boolean tryParseBoolean(String s, OutObject<Boolean> result) {
+    public static boolean tryParseBoolean(String s, Out<Boolean> result) {
         try {
             result.set(Boolean.parseBoolean(s));
             return true;
@@ -22,7 +22,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseByte(String s, OutObject<Byte> result) {
+    public static boolean tryParseByte(String s, Out<Byte> result) {
         try {
             result.set(Byte.parseByte(s));
             return true;
@@ -31,7 +31,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseDouble(String s, OutObject<Double> result) {
+    public static boolean tryParseDouble(String s, Out<Double> result) {
         try {
             result.set(Double.parseDouble(s));
             return true;
@@ -40,7 +40,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseFloat(String s, OutObject<Float> result) {
+    public static boolean tryParseFloat(String s, Out<Float> result) {
         try {
             result.set(Float.parseFloat(s));
             return true;
@@ -49,7 +49,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseInt(String s, OutObject<Integer> result) {
+    public static boolean tryParseInt(String s, Out<Integer> result) {
         try {
             result.set(Integer.parseInt(s));
             return true;
@@ -58,7 +58,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseLong(String s, OutObject<Long> result) {
+    public static boolean tryParseLong(String s, Out<Long> result) {
         try {
             result.set(Long.parseLong(s));
             return true;
@@ -67,7 +67,7 @@ public final class TryParseHelper {
         }
     }
 
-    public static boolean tryParseShort(String s, OutObject<Short> result) {
+    public static boolean tryParseShort(String s, Out<Short> result) {
         try {
             result.set(Short.parseShort(s));
             return true;
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/BenchmarkSuiteBase.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/BenchmarkSuiteBase.java
index d5a238f..9762259 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/BenchmarkSuiteBase.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/BenchmarkSuiteBase.java
@@ -4,8 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.MemorySpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -74,16 +74,16 @@ public class BenchmarkSuiteBase {
     // Dictionary<Utf8String, object> rowValue)
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     protected static Result LoadOneRow(Memory<Byte> buffer, LayoutResolver resolver,
-                                       OutObject<HashMap<Utf8String, Object>> rowValue) {
+                                       Out<HashMap<Utf8String, Object>> rowValue) {
         RowBuffer row = new RowBuffer(buffer.Span, HybridRowVersion.V1, resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row);
-        row = tempRef_row.get();
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
-        Result tempVar = DiagnosticConverter.ReaderToDynamic(tempRef_reader, rowValue);
-        reader = tempRef_reader.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row);
+        row = tempReference_row.get();
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
+        Result tempVar = DiagnosticConverter.ReaderToDynamic(tempReference_reader, rowValue);
+        reader = tempReference_reader.get();
         return tempVar;
     }
 
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenMicroBenchmarkSuite.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenMicroBenchmarkSuite.java
index f6f9760..f89952f 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenMicroBenchmarkSuite.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenMicroBenchmarkSuite.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 
 import java.util.ArrayList;
@@ -14,7 +15,7 @@ import java.util.HashMap;
  * Tests involving generated (early bound) code compiled from schema based on a partial implementation
  * of Cassandra Hotel Schema described here: https: //www.oreilly.com/ideas/cassandra-data-modeling .
  * <p>
- * The tests here differ from <see cref="SchematizedMicroBenchmarkSuite" /> in that they rely on
+ * The tests here differ from {@link SchematizedMicroBenchmarkSuite} in that they rely on
  * the schema being known at compile time instead of runtime. This allows code to be generated that
  * directly addresses the schema structure instead of dynamically discovering schema structure at
  * runtime.
@@ -228,16 +229,17 @@ public final class CodeGenMicroBenchmarkSuite extends MicroBenchmarkSuiteBase {
             expectedSerialized.add(context.CodeGenWriter.ToArray());
         }
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Read", dataSetName, "HybridRowGen", innerLoopIterations, ref context, (ref BenchmarkContext ctx, byte[] tableValue) =>
-        MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Read", dataSetName, "HybridRowGen", innerLoopIterations, tempRef_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
+        MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Read", dataSetName, "HybridRowGen", innerLoopIterations,
+            tempReference_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
         {
             Result r = ctx.CodeGenWriter.ReadBuffer(tableValue);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void CodeGenWriteBenchmark(LayoutResolverNamespace resolver, String schemaName, String dataSetName
@@ -247,18 +249,18 @@ public final class CodeGenMicroBenchmarkSuite extends MicroBenchmarkSuiteBase {
         BenchmarkContext context = new BenchmarkContext();
         context.CodeGenWriter = new CodeGenRowGenerator(BenchmarkSuiteBase.InitialCapacity, layout, resolver);
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Write", dataSetName, "HybridRowGen", innerLoopIterations,
-            tempRef_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
+            tempReference_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
         {
             ctx.CodeGenWriter.Reset();
 
             Result r = ctx.CodeGenWriter.WriteBuffer(tableValue);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) -> ctx.CodeGenWriter.Length, expected);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void ProtobufReadBenchmark(String schemaName, String dataSetName, int innerLoopIterations,
@@ -277,7 +279,7 @@ public final class CodeGenMicroBenchmarkSuite extends MicroBenchmarkSuiteBase {
             expectedSerialized.add(context.ProtobufWriter.ToArray());
         }
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
@@ -286,10 +288,10 @@ public final class CodeGenMicroBenchmarkSuite extends MicroBenchmarkSuiteBase {
         // .ReadBuffer(tableValue), (ref BenchmarkContext ctx, byte[] tableValue) => tableValue.Length,
         // expectedSerialized);
         MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Read", dataSetName, "Protobuf", innerLoopIterations,
-            tempRef_context,
+            tempReference_context,
             (ref BenchmarkContext ctx, byte[] tableValue) -> ctx.ProtobufWriter.ReadBuffer(tableValue),
             (ref BenchmarkContext ctx, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void ProtobufWriteBenchmark(String schemaName, String dataSetName, int innerLoopIterations,
@@ -297,14 +299,14 @@ public final class CodeGenMicroBenchmarkSuite extends MicroBenchmarkSuiteBase {
         BenchmarkContext context = new BenchmarkContext();
         context.ProtobufWriter = new ProtobufRowGenerator(schemaName, BenchmarkSuiteBase.InitialCapacity);
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         MicroBenchmarkSuiteBase.Benchmark("CodeGen", "Write", dataSetName, "Protobuf", innerLoopIterations,
-            tempRef_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
+            tempReference_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
         {
             ctx.ProtobufWriter.WriteBuffer(tableValue);
         }, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) -> ctx.ProtobufWriter.Length, expected);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenRowGenerator.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenRowGenerator.java
index a315244..7c0c2b7 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenRowGenerator.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/CodeGenRowGenerator.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.ISpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -80,17 +81,17 @@ public final class CodeGenRowGenerator {
     //ORIGINAL LINE: public Result ReadBuffer(byte[] buffer)
     public Result ReadBuffer(byte[] buffer) {
         this.row = new RowBuffer(buffer.AsSpan(), HybridRowVersion.V1, this.row.getResolver());
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        this.row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_root =
-            new RefObject<RowCursor>(root);
-        Result tempVar = this.dispatcher.ReadBuffer(tempRef_row2, tempRef_root);
-        root = tempRef_root.get();
-        this.row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        this.row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_root =
+            new Reference<RowCursor>(root);
+        Result tempVar = this.dispatcher.ReadBuffer(tempReference_row2, tempReference_root);
+        root = tempReference_root.get();
+        this.row = tempReference_row2.get();
         return tempVar;
     }
 
@@ -106,17 +107,17 @@ public final class CodeGenRowGenerator {
     }
 
     public Result WriteBuffer(HashMap<Utf8String, Object> tableValue) {
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        this.row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(this.row);
-        RefObject<RowCursor> tempRef_root =
-            new RefObject<RowCursor>(root);
-        Result tempVar = this.dispatcher.WriteBuffer(tempRef_row2, tempRef_root, tableValue);
-        root = tempRef_root.get();
-        this.row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        this.row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(this.row);
+        Reference<RowCursor> tempReference_root =
+            new Reference<RowCursor>(root);
+        Result tempVar = this.dispatcher.WriteBuffer(tempReference_row2, tempReference_root, tableValue);
+        root = tempReference_root.get();
+        this.row = tempReference_row2.get();
         return tempVar;
     }
 
@@ -142,42 +143,42 @@ public final class CodeGenRowGenerator {
         private LayoutColumn street;
 
         public AddressHybridRowSerializer(Layout layout, LayoutResolver resolver) {
-            OutObject<LayoutColumn> tempOut_street = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_street = new Out<LayoutColumn>();
             layout.TryFind(AddressHybridRowSerializer.StreetName, tempOut_street);
             this.street = tempOut_street.get();
-            OutObject<LayoutColumn> tempOut_city = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_city = new Out<LayoutColumn>();
             layout.TryFind(AddressHybridRowSerializer.CityName, tempOut_city);
             this.city = tempOut_city.get();
-            OutObject<LayoutColumn> tempOut_state = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_state = new Out<LayoutColumn>();
             layout.TryFind(AddressHybridRowSerializer.StateName, tempOut_state);
             this.state = tempOut_state.get();
-            OutObject<LayoutColumn> tempOut_postalCode = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_postalCode = new Out<LayoutColumn>();
             layout.TryFind(AddressHybridRowSerializer.PostalCodeName, tempOut_postalCode);
             this.postalCode = tempOut_postalCode.get();
-            OutObject<StringToken> tempOut_postalCodeToken = new OutObject<StringToken>();
+            Out<StringToken> tempOut_postalCodeToken = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.postalCode.getPath(), tempOut_postalCodeToken);
             this.postalCodeToken = tempOut_postalCodeToken.get();
             this.postalCodeSerializer = new PostalCodeHybridRowSerializer(resolver.Resolve(this.postalCode.getTypeArgs().getSchemaId().clone()), resolver);
         }
 
         @Override
-        public Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+        public Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root) {
             Utf8Span _;
-            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
             Result r = LayoutType.Utf8.ReadVariable(row, root, this.street, out _);
             if (r != Result.Success) {
                 return r;
             }
 
             Utf8Span _;
-            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.city, out _);
             if (r != Result.Success) {
                 return r;
             }
 
             Utf8Span _;
-            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
             r = LayoutType.Utf8.ReadFixed(row, root, this.state, out _);
             if (r != Result.Success) {
                 return r;
@@ -185,28 +186,28 @@ public final class CodeGenRowGenerator {
 
             root.get().Find(row, this.postalCodeToken.clone());
             RowCursor childScope;
-            OutObject<RowCursor> tempOut_childScope = new OutObject<RowCursor>();
+            Out<RowCursor> tempOut_childScope = new Out<RowCursor>();
             r = LayoutType.UDT.ReadScope(row, root, tempOut_childScope);
             childScope = tempOut_childScope.get();
             if (r != Result.Success) {
                 return r;
             }
 
-            RefObject<RowCursor> tempRef_childScope = new RefObject<RowCursor>(childScope);
-            r = this.postalCodeSerializer.ReadBuffer(row, tempRef_childScope);
-            childScope = tempRef_childScope.get();
+            Reference<RowCursor> tempReference_childScope = new Reference<RowCursor>(childScope);
+            r = this.postalCodeSerializer.ReadBuffer(row, tempReference_childScope);
+            childScope = tempReference_childScope.get();
             if (r != Result.Success) {
                 return r;
             }
 
-            RefObject<RowCursor> tempRef_childScope2 = new RefObject<RowCursor>(childScope);
-            RowCursorExtensions.Skip(root.get().clone(), row, tempRef_childScope2);
-            childScope = tempRef_childScope2.get();
+            Reference<RowCursor> tempReference_childScope2 = new Reference<RowCursor>(childScope);
+            RowCursorExtensions.Skip(root.get().clone(), row, tempReference_childScope2);
+            childScope = tempReference_childScope2.get();
             return Result.Success;
         }
 
         @Override
-        public Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root, HashMap<Utf8String, Object> tableValue) {
+        public Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root, HashMap<Utf8String, Object> tableValue) {
             for ((Utf8String key,Object value) :tableValue)
             {
                 Result r;
@@ -253,7 +254,7 @@ public final class CodeGenRowGenerator {
                         if (value != null) {
                             root.get().Find(row, this.postalCodeToken.clone());
                             RowCursor childScope;
-                            OutObject<RowCursor> tempOut_childScope = new OutObject<RowCursor>();
+                            Out<RowCursor> tempOut_childScope = new Out<RowCursor>();
                             r = LayoutType.UDT.WriteScope(row, root, this.postalCode.getTypeArgs().clone(), tempOut_childScope);
                             childScope = tempOut_childScope.get();
 
@@ -261,16 +262,16 @@ public final class CodeGenRowGenerator {
                                 return r;
                             }
 
-                            RefObject<RowCursor> tempRef_childScope = new RefObject<RowCursor>(childScope);
-                            r = this.postalCodeSerializer.WriteBuffer(row, tempRef_childScope, (HashMap<Utf8String, Object>)value);
-                            childScope = tempRef_childScope.get();
+                            Reference<RowCursor> tempReference_childScope = new Reference<RowCursor>(childScope);
+                            r = this.postalCodeSerializer.WriteBuffer(row, tempReference_childScope, (HashMap<Utf8String, Object>)value);
+                            childScope = tempReference_childScope.get();
                             if (r != Result.Success) {
                                 return r;
                             }
 
-                            RefObject<RowCursor> tempRef_childScope2 = new RefObject<RowCursor>(childScope);
-                            RowCursorExtensions.Skip(root.get().clone(), row, tempRef_childScope2);
-                            childScope = tempRef_childScope2.get();
+                            Reference<RowCursor> tempReference_childScope2 = new Reference<RowCursor>(childScope);
+                            RowCursorExtensions.Skip(root.get().clone(), row, tempReference_childScope2);
+                            childScope = tempReference_childScope2.get();
                         }
 
                         break;
@@ -310,41 +311,41 @@ public final class CodeGenRowGenerator {
         private LayoutColumn title;
 
         public GuestsHybridRowSerializer(Layout layout, LayoutResolver resolver) {
-            OutObject<LayoutColumn> tempOut_guestId =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_guestId =
+                new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.GuestIdName, tempOut_guestId);
             this.guestId = tempOut_guestId.get();
-            OutObject<LayoutColumn> tempOut_firstName = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_firstName = new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.FirstNameName, tempOut_firstName);
             this.firstName = tempOut_firstName.get();
-            OutObject<LayoutColumn> tempOut_lastName
-                = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_lastName
+                = new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.LastNameName, tempOut_lastName);
             this.lastName = tempOut_lastName.get();
-            OutObject<LayoutColumn> tempOut_title =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_title =
+                new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.TitleName, tempOut_title);
             this.title = tempOut_title.get();
-            OutObject<LayoutColumn> tempOut_emails =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_emails =
+                new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.EmailsName, tempOut_emails);
             this.emails = tempOut_emails.get();
-            OutObject<LayoutColumn> tempOut_phoneNumbers = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_phoneNumbers = new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.PhoneNumbersName, tempOut_phoneNumbers);
             this.phoneNumbers = tempOut_phoneNumbers.get();
-            OutObject<LayoutColumn> tempOut_addresses = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_addresses = new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.AddressesName, tempOut_addresses);
             this.addresses = tempOut_addresses.get();
-            OutObject<LayoutColumn> tempOut_confirmNumber = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_confirmNumber = new Out<LayoutColumn>();
             layout.TryFind(GuestsHybridRowSerializer.ConfirmNumberName, tempOut_confirmNumber);
             this.confirmNumber = tempOut_confirmNumber.get();
-            OutObject<StringToken> tempOut_emailsToken = new OutObject<StringToken>();
+            Out<StringToken> tempOut_emailsToken = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.emails.getPath(), tempOut_emailsToken);
             this.emailsToken = tempOut_emailsToken.get();
-            OutObject<StringToken> tempOut_phoneNumbersToken = new OutObject<StringToken>();
+            Out<StringToken> tempOut_phoneNumbersToken = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.phoneNumbers.getPath(), tempOut_phoneNumbersToken);
             this.phoneNumbersToken = tempOut_phoneNumbersToken.get();
-            OutObject<StringToken> tempOut_addressesToken = new OutObject<StringToken>();
+            Out<StringToken> tempOut_addressesToken = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.addresses.getPath(), tempOut_addressesToken);
             this.addressesToken = tempOut_addressesToken.get();
 
@@ -354,15 +355,15 @@ public final class CodeGenRowGenerator {
 
             this.addressSerializer =
                 new AddressHybridRowSerializer(resolver.Resolve(this.addresses.getTypeArgs().get(1).getTypeArgs().getSchemaId().clone()), resolver);
-            this.addressSerializerWriter = (RefObject<RowBuffer> b, RefObject<RowCursor> scope,
+            this.addressSerializerWriter = (Reference<RowBuffer> b, Reference<RowCursor> scope,
                                             HashMap<Utf8String, Object> context) -> addressSerializer.WriteBuffer(b,
                 scope, context);
         }
 
         @Override
-        public Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+        public Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root) {
             java.util.UUID _;
-            OutObject<UUID> tempOut__ = new OutObject<UUID>();
+            Out<UUID> tempOut__ = new Out<UUID>();
             Result r = LayoutType.Guid.ReadFixed(row, root, this.guestId, tempOut__);
             _ = tempOut__.get();
             if (r != Result.Success) {
@@ -371,7 +372,7 @@ public final class CodeGenRowGenerator {
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.firstName, out _);
             if (r != Result.Success) {
@@ -380,7 +381,7 @@ public final class CodeGenRowGenerator {
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.lastName, out _);
             if (r != Result.Success) {
@@ -389,7 +390,7 @@ public final class CodeGenRowGenerator {
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.title, out _);
             if (r != Result.Success) {
@@ -398,8 +399,8 @@ public final class CodeGenRowGenerator {
 
             root.get().Find(row, this.emailsToken.clone());
             RowCursor childScope;
-            OutObject<RowCursor> tempOut_childScope =
-                new OutObject<RowCursor>();
+            Out<RowCursor> tempOut_childScope =
+                new Out<RowCursor>();
             r = LayoutType.TypedArray.ReadScope(row, root, tempOut_childScope);
             childScope = tempOut_childScope.get();
             if (r != Result.Success) {
@@ -409,10 +410,10 @@ public final class CodeGenRowGenerator {
             while (childScope.MoveNext(row)) {
                 Utf8Span _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 r = LayoutType.Utf8.ReadSparse(row, ref childScope, out _);
                 if (r != Result.Success) {
@@ -420,14 +421,14 @@ public final class CodeGenRowGenerator {
                 }
             }
 
-            RefObject<RowCursor> tempRef_childScope =
-                new RefObject<RowCursor>(childScope);
+            Reference<RowCursor> tempReference_childScope =
+                new Reference<RowCursor>(childScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_childScope);
-            childScope = tempRef_childScope.get();
+                tempReference_childScope);
+            childScope = tempReference_childScope.get();
             root.get().Find(row, this.phoneNumbersToken.clone());
-            OutObject<RowCursor> tempOut_childScope2 =
-                new OutObject<RowCursor>();
+            Out<RowCursor> tempOut_childScope2 =
+                new Out<RowCursor>();
             r = LayoutType.TypedArray.ReadScope(row, root, tempOut_childScope2);
             childScope = tempOut_childScope2.get();
             if (r != Result.Success) {
@@ -437,10 +438,10 @@ public final class CodeGenRowGenerator {
             while (childScope.MoveNext(row)) {
                 Utf8Span _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 r = LayoutType.Utf8.ReadSparse(row, ref childScope, out _);
                 if (r != Result.Success) {
@@ -448,14 +449,14 @@ public final class CodeGenRowGenerator {
                 }
             }
 
-            RefObject<RowCursor> tempRef_childScope2 =
-                new RefObject<RowCursor>(childScope);
+            Reference<RowCursor> tempReference_childScope2 =
+                new Reference<RowCursor>(childScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_childScope2);
-            childScope = tempRef_childScope2.get();
+                tempReference_childScope2);
+            childScope = tempReference_childScope2.get();
             root.get().Find(row, this.addressesToken.clone());
-            OutObject<RowCursor> tempOut_childScope3 =
-                new OutObject<RowCursor>();
+            Out<RowCursor> tempOut_childScope3 =
+                new Out<RowCursor>();
             r = LayoutType.TypedMap.ReadScope(row, root, tempOut_childScope3);
             childScope = tempOut_childScope3.get();
             if (r != Result.Success) {
@@ -463,14 +464,14 @@ public final class CodeGenRowGenerator {
             }
 
             while (childScope.MoveNext(row)) {
-                RefObject<RowCursor> tempRef_childScope3 =
-                    new RefObject<RowCursor>(childScope);
+                Reference<RowCursor> tempReference_childScope3 =
+                    new Reference<RowCursor>(childScope);
                 RowCursor tupleScope;
-                OutObject<RowCursor> tempOut_tupleScope =
-                    new OutObject<RowCursor>();
-                r = LayoutType.TypedTuple.ReadScope(row, tempRef_childScope3, tempOut_tupleScope);
+                Out<RowCursor> tempOut_tupleScope =
+                    new Out<RowCursor>();
+                r = LayoutType.TypedTuple.ReadScope(row, tempReference_childScope3, tempOut_tupleScope);
                 tupleScope = tempOut_tupleScope.get();
-                childScope = tempRef_childScope3.get();
+                childScope = tempReference_childScope3.get();
                 if (r != Result.Success) {
                     return r;
                 }
@@ -481,10 +482,10 @@ public final class CodeGenRowGenerator {
 
                 Utf8Span _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 r = LayoutType.Utf8.ReadSparse(row, ref tupleScope, out _);
                 if (r != Result.Success) {
@@ -495,51 +496,51 @@ public final class CodeGenRowGenerator {
                     return Result.InvalidRow;
                 }
 
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor valueScope;
-                OutObject<RowCursor> tempOut_valueScope =
-                    new OutObject<RowCursor>();
-                r = LayoutType.ImmutableUDT.ReadScope(row, tempRef_tupleScope, tempOut_valueScope);
+                Out<RowCursor> tempOut_valueScope =
+                    new Out<RowCursor>();
+                r = LayoutType.ImmutableUDT.ReadScope(row, tempReference_tupleScope, tempOut_valueScope);
                 valueScope = tempOut_valueScope.get();
-                tupleScope = tempRef_tupleScope.get();
+                tupleScope = tempReference_tupleScope.get();
                 if (r != Result.Success) {
                     return r;
                 }
 
-                RefObject<RowCursor> tempRef_valueScope =
-                    new RefObject<RowCursor>(valueScope);
-                r = this.addressSerializer.ReadBuffer(row, tempRef_valueScope);
-                valueScope = tempRef_valueScope.get();
+                Reference<RowCursor> tempReference_valueScope =
+                    new Reference<RowCursor>(valueScope);
+                r = this.addressSerializer.ReadBuffer(row, tempReference_valueScope);
+                valueScope = tempReference_valueScope.get();
                 if (r != Result.Success) {
                     return r;
                 }
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 tupleScope.Skip(row, ref valueScope);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 childScope.Skip(row, ref tupleScope);
             }
 
-            RefObject<RowCursor> tempRef_childScope4 =
-                new RefObject<RowCursor>(childScope);
+            Reference<RowCursor> tempReference_childScope4 =
+                new Reference<RowCursor>(childScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_childScope4);
-            childScope = tempRef_childScope4.get();
+                tempReference_childScope4);
+            childScope = tempReference_childScope4.get();
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             return LayoutType.Utf8.ReadVariable(row, root, this.confirmNumber, out _);
         }
 
         @Override
-        public Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+        public Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root,
                                   HashMap<Utf8String, Object> tableValue) {
             for ((Utf8String key,Object value) :tableValue)
             {
@@ -610,9 +611,9 @@ public final class CodeGenRowGenerator {
                                                            ArrayList<Object> context) ->
                             {
                                 for (Object item : context) {
-                                    RefObject<ref RowBuffer>tempRef_row2 = new RefObject<ref
+                                    Reference<ref RowBuffer>tempRef_row2 = new Reference<ref
                                     RowBuffer > (row2);
-                                    RefObject<ref RowCursor>tempRef_childScope = new RefObject<ref
+                                    Reference<ref RowCursor>tempRef_childScope = new Reference<ref
                                     RowCursor > (childScope);
                                     Result r2 = LayoutType.Utf8.WriteSparse(tempRef_row2, tempRef_childScope,
                                         (Utf8String)item);
@@ -622,7 +623,7 @@ public final class CodeGenRowGenerator {
                                         return r2;
                                     }
 
-                                    RefObject<ref RowBuffer>tempRef_row22 = new RefObject<ref
+                                    Reference<ref RowBuffer>tempRef_row22 = new Reference<ref
                                     RowBuffer > (row2);
                                     childScope.MoveNext(tempRef_row22);
                                     row2 = tempRef_row22.argValue;
@@ -644,7 +645,7 @@ public final class CodeGenRowGenerator {
                         if (value != null) {
                             root.get().Find(row, this.phoneNumbersToken.clone());
                             RowCursor childScope;
-                            OutObject<RowCursor> tempOut_childScope = new OutObject<RowCursor>();
+                            Out<RowCursor> tempOut_childScope = new Out<RowCursor>();
                             r = LayoutType.TypedArray.WriteScope(row, root, this.phoneNumbers.getTypeArgs().clone(),
                                 tempOut_childScope);
                             childScope = tempOut_childScope.get();
@@ -654,7 +655,7 @@ public final class CodeGenRowGenerator {
 
                             for (Object item : (ArrayList<Object>)value) {
                                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved
-                                // 'ref' keyword - these cannot be converted using the 'RefObject' helper class
+                                // 'ref' keyword - these cannot be converted using the 'Ref' helper class
                                 // unless the method is within the code being modified:
                                 r = LayoutType.Utf8.WriteSparse(row, ref childScope, (Utf8String)item);
                                 if (r != Result.Success) {
@@ -664,9 +665,9 @@ public final class CodeGenRowGenerator {
                                 childScope.MoveNext(row);
                             }
 
-                            RefObject<RowCursor> tempRef_childScope = new RefObject<RowCursor>(childScope);
-                            RowCursorExtensions.Skip(root.get().clone(), row, tempRef_childScope);
-                            childScope = tempRef_childScope.get();
+                            Reference<RowCursor> tempReference_childScope = new Reference<RowCursor>(childScope);
+                            RowCursorExtensions.Skip(root.get().clone(), row, tempReference_childScope);
+                            childScope = tempReference_childScope.get();
                         }
 
                         break;
@@ -685,16 +686,17 @@ public final class CodeGenRowGenerator {
                             _this, ArrayList < Object > value)ctx) ->
                             {
                                 for (Object item : ctx.value) {
-                                    RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(row2);
-                                    RefObject<RowCursor> tempRef_childScope = new RefObject<RowCursor>(childScope);
-                                    Result r2 = LayoutType.TypedTuple.WriteScope(tempRef_row2, tempRef_childScope,
+                                    Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(row2);
+                                    Reference<RowCursor> tempReference_childScope = new Reference<RowCursor>(childScope);
+                                    Result r2 = LayoutType.TypedTuple.WriteScope(tempReference_row2,
+                                        tempReference_childScope,
                                         ctx._this.addresses.TypeArgs, (ctx._this, (ArrayList<Object>)item),
                                     (ref RowBuffer row3, ref RowCursor tupleScope, (GuestsHybridRowSerializer
                                     _this, ArrayList < Object > value)ctx2) ->
                                     {
-                                        RefObject<ref RowBuffer>tempRef_row3 = new RefObject<ref
+                                        Reference<ref RowBuffer>tempRef_row3 = new Reference<ref
                                         RowBuffer > (row3);
-                                        RefObject<ref RowCursor>tempRef_tupleScope = new RefObject<ref
+                                        Reference<ref RowCursor>tempRef_tupleScope = new Reference<ref
                                         RowCursor > (tupleScope);
                                         Result r3 = LayoutType.Utf8.WriteSparse(tempRef_row3, tempRef_tupleScope,
                                             (Utf8String)ctx2.value[0]);
@@ -704,27 +706,27 @@ public final class CodeGenRowGenerator {
                                             return r3;
                                         }
 
-                                        RefObject<ref RowBuffer>tempRef_row32 = new RefObject<ref
+                                        Reference<ref RowBuffer>tempRef_row32 = new Reference<ref
                                         RowBuffer > (row3);
                                         tupleScope.MoveNext(tempRef_row32);
                                         row3 = tempRef_row32.argValue;
-                                        RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row33 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row3);
-                                        RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_tupleScope2 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupleScope);
-                                        Result tempVar = LayoutType.ImmutableUDT.WriteScope(tempRef_row33,
-                                            tempRef_tupleScope2, ctx2._this.addresses.TypeArgs[1].TypeArgs,
+                                        Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row33 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row3);
+                                        Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_tupleScope2 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupleScope);
+                                        Result tempVar = LayoutType.ImmutableUDT.WriteScope(tempReference_row33,
+                                            tempReference_tupleScope2, ctx2._this.addresses.TypeArgs[1].TypeArgs,
                                             (HashMap<Utf8String, Object>)ctx2.value[1],
                                             ctx2._this.addressSerializerWriter);
-                                        tupleScope = tempRef_tupleScope2.get();
-                                        row3 = tempRef_row33.get();
+                                        tupleScope = tempReference_tupleScope2.get();
+                                        row3 = tempReference_row33.get();
                                         return tempVar;
                                     })
-                                    childScope = tempRef_childScope.get();
-                                    row2 = tempRef_row2.get();
+                                    childScope = tempReference_childScope.get();
+                                    row2 = tempReference_row2.get();
                                     if (r2 != Result.Success) {
                                         return r2;
                                     }
 
-                                    RefObject<ref RowBuffer>tempRef_row22 = new RefObject<ref
+                                    Reference<ref RowBuffer>tempRef_row22 = new Reference<ref
                                     RowBuffer > (row2);
                                     childScope.MoveNext(tempRef_row22);
                                     row2 = tempRef_row22.argValue;
@@ -775,23 +777,23 @@ public final class CodeGenRowGenerator {
         private LayoutColumn phone;
 
         public HotelsHybridRowSerializer(Layout layout, LayoutResolver resolver) {
-            OutObject<LayoutColumn> tempOut_hotelId =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_hotelId =
+                new Out<LayoutColumn>();
             layout.TryFind(HotelsHybridRowSerializer.HotelIdName, tempOut_hotelId);
             this.hotelId = tempOut_hotelId.get();
-            OutObject<LayoutColumn> tempOut_name =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_name =
+                new Out<LayoutColumn>();
             layout.TryFind(HotelsHybridRowSerializer.NameName, tempOut_name);
             this.name = tempOut_name.get();
-            OutObject<LayoutColumn> tempOut_phone =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_phone =
+                new Out<LayoutColumn>();
             layout.TryFind(HotelsHybridRowSerializer.PhoneName, tempOut_phone);
             this.phone = tempOut_phone.get();
-            OutObject<LayoutColumn> tempOut_address =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_address =
+                new Out<LayoutColumn>();
             layout.TryFind(HotelsHybridRowSerializer.AddressName, tempOut_address);
             this.address = tempOut_address.get();
-            OutObject<StringToken> tempOut_addressToken = new OutObject<StringToken>();
+            Out<StringToken> tempOut_addressToken = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.address.getPath(), tempOut_addressToken);
             this.addressToken = tempOut_addressToken.get();
             this.addressSerializer =
@@ -800,10 +802,10 @@ public final class CodeGenRowGenerator {
         }
 
         @Override
-        public Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+        public Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root) {
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             Result r = LayoutType.Utf8.ReadFixed(row, root, this.hotelId, out _);
             if (r != Result.Success) {
@@ -812,7 +814,7 @@ public final class CodeGenRowGenerator {
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.name, out _);
             if (r != Result.Success) {
@@ -821,7 +823,7 @@ public final class CodeGenRowGenerator {
 
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             r = LayoutType.Utf8.ReadVariable(row, root, this.phone, out _);
             if (r != Result.Success) {
@@ -830,32 +832,32 @@ public final class CodeGenRowGenerator {
 
             root.get().Find(row, this.addressToken.clone());
             RowCursor childScope;
-            OutObject<RowCursor> tempOut_childScope =
-                new OutObject<RowCursor>();
+            Out<RowCursor> tempOut_childScope =
+                new Out<RowCursor>();
             r = LayoutType.UDT.ReadScope(row, root, tempOut_childScope);
             childScope = tempOut_childScope.get();
             if (r != Result.Success) {
                 return r;
             }
 
-            RefObject<RowCursor> tempRef_childScope =
-                new RefObject<RowCursor>(childScope);
-            r = this.addressSerializer.ReadBuffer(row, tempRef_childScope);
-            childScope = tempRef_childScope.get();
+            Reference<RowCursor> tempReference_childScope =
+                new Reference<RowCursor>(childScope);
+            r = this.addressSerializer.ReadBuffer(row, tempReference_childScope);
+            childScope = tempReference_childScope.get();
             if (r != Result.Success) {
                 return r;
             }
 
-            RefObject<RowCursor> tempRef_childScope2 =
-                new RefObject<RowCursor>(childScope);
+            Reference<RowCursor> tempReference_childScope2 =
+                new Reference<RowCursor>(childScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_childScope2);
-            childScope = tempRef_childScope2.get();
+                tempReference_childScope2);
+            childScope = tempReference_childScope2.get();
             return Result.Success;
         }
 
         @Override
-        public Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+        public Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root,
                                   HashMap<Utf8String, Object> tableValue) {
             for ((Utf8String key,Object value) :tableValue)
             {
@@ -907,7 +909,7 @@ public final class CodeGenRowGenerator {
                         if (value != null) {
                             root.get().Find(row, this.addressToken.clone());
                             RowCursor childScope;
-                            OutObject<RowCursor> tempOut_childScope = new OutObject<RowCursor>();
+                            Out<RowCursor> tempOut_childScope = new Out<RowCursor>();
                             r = LayoutType.UDT.WriteScope(row, root, this.address.getTypeArgs().clone(),
                                 tempOut_childScope);
                             childScope = tempOut_childScope.get();
@@ -915,17 +917,17 @@ public final class CodeGenRowGenerator {
                                 return r;
                             }
 
-                            RefObject<RowCursor> tempRef_childScope = new RefObject<RowCursor>(childScope);
-                            r = this.addressSerializer.WriteBuffer(row, tempRef_childScope, (HashMap<Utf8String,
+                            Reference<RowCursor> tempReference_childScope = new Reference<RowCursor>(childScope);
+                            r = this.addressSerializer.WriteBuffer(row, tempReference_childScope, (HashMap<Utf8String,
                                 Object>)value);
-                            childScope = tempRef_childScope.get();
+                            childScope = tempReference_childScope.get();
                             if (r != Result.Success) {
                                 return r;
                             }
 
-                            RefObject<RowCursor> tempRef_childScope2 = new RefObject<RowCursor>(childScope);
-                            RowCursorExtensions.Skip(root.get().clone(), row, tempRef_childScope2);
-                            childScope = tempRef_childScope2.get();
+                            Reference<RowCursor> tempReference_childScope2 = new Reference<RowCursor>(childScope);
+                            RowCursorExtensions.Skip(root.get().clone(), row, tempReference_childScope2);
+                            childScope = tempReference_childScope2.get();
                         }
 
                         break;
@@ -941,9 +943,9 @@ public final class CodeGenRowGenerator {
     }
 
     private abstract static class HybridRowSerializer {
-        public abstract Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root);
+        public abstract Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root);
 
-        public abstract Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+        public abstract Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            HashMap<Utf8String, Object> tableValue);
     }
 
@@ -956,23 +958,23 @@ public final class CodeGenRowGenerator {
 
         // ReSharper disable once UnusedParameter.Local
         public PostalCodeHybridRowSerializer(Layout layout, LayoutResolver resolver) {
-            OutObject<LayoutColumn> tempOut_zip =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_zip =
+                new Out<LayoutColumn>();
             layout.TryFind(PostalCodeHybridRowSerializer.ZipName, tempOut_zip);
             this.zip = tempOut_zip.get();
-            OutObject<LayoutColumn> tempOut_plus4 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_plus4 =
+                new Out<LayoutColumn>();
             layout.TryFind(PostalCodeHybridRowSerializer.Plus4Name, tempOut_plus4);
             this.plus4 = tempOut_plus4.get();
-            OutObject<StringToken> tempOut_plus4Token = new OutObject<StringToken>();
+            Out<StringToken> tempOut_plus4Token = new Out<StringToken>();
             layout.getTokenizer().TryFindToken(this.plus4.getPath(), tempOut_plus4Token);
             this.plus4Token = tempOut_plus4Token.get();
         }
 
         @Override
-        public Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+        public Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root) {
             int _;
-            OutObject<Integer> tempOut__ = new OutObject<Integer>();
+            Out<Integer> tempOut__ = new Out<Integer>();
             Result r = LayoutType.Int32.ReadFixed(row, root, this.zip, tempOut__);
             _ = tempOut__.get();
             if (r != Result.Success) {
@@ -981,14 +983,14 @@ public final class CodeGenRowGenerator {
 
             root.get().Find(row, this.plus4Token.clone());
             short _;
-            OutObject<Short> tempOut__2 = new OutObject<Short>();
+            Out<Short> tempOut__2 = new Out<Short>();
             Result tempVar = LayoutType.Int16.ReadSparse(row, root, tempOut__2);
             _ = tempOut__2.get();
             return tempVar;
         }
 
         @Override
-        public Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+        public Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root,
                                   HashMap<Utf8String, Object> tableValue) {
             for ((Utf8String key,Object value) :tableValue)
             {
@@ -1043,27 +1045,27 @@ public final class CodeGenRowGenerator {
 
         // ReSharper disable once UnusedParameter.Local
         public RoomsHybridRowSerializer(Layout layout, LayoutResolver resolver) {
-            OutObject<LayoutColumn> tempOut_hotelId =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_hotelId =
+                new Out<LayoutColumn>();
             layout.TryFind(RoomsHybridRowSerializer.HotelIdName, tempOut_hotelId);
             this.hotelId = tempOut_hotelId.get();
-            OutObject<LayoutColumn> tempOut_date =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_date =
+                new Out<LayoutColumn>();
             layout.TryFind(RoomsHybridRowSerializer.DateName, tempOut_date);
             this.date = tempOut_date.get();
-            OutObject<LayoutColumn> tempOut_roomNumber = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_roomNumber = new Out<LayoutColumn>();
             layout.TryFind(RoomsHybridRowSerializer.RoomNumberName, tempOut_roomNumber);
             this.roomNumber = tempOut_roomNumber.get();
-            OutObject<LayoutColumn> tempOut_isAvailable = new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_isAvailable = new Out<LayoutColumn>();
             layout.TryFind(RoomsHybridRowSerializer.IsAvailableName, tempOut_isAvailable);
             this.isAvailable = tempOut_isAvailable.get();
         }
 
         @Override
-        public Result ReadBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+        public Result ReadBuffer(Reference<RowBuffer> row, Reference<RowCursor> root) {
             Utf8Span _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             Result r = LayoutType.Utf8.ReadFixed(row, root, this.hotelId, out _);
             if (r != Result.Success) {
@@ -1071,7 +1073,7 @@ public final class CodeGenRowGenerator {
             }
 
             java.time.LocalDateTime _;
-            OutObject<LocalDateTime> tempOut__ = new OutObject<LocalDateTime>();
+            Out<LocalDateTime> tempOut__ = new Out<LocalDateTime>();
             r = LayoutType.DateTime.ReadFixed(row, root, this.date, tempOut__);
             _ = tempOut__.get();
             if (r != Result.Success) {
@@ -1079,7 +1081,7 @@ public final class CodeGenRowGenerator {
             }
 
             byte _;
-            OutObject<Byte> tempOut__2 = new OutObject<Byte>();
+            Out<Byte> tempOut__2 = new Out<Byte>();
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: r = LayoutType.UInt8.ReadFixed(ref row, ref root, this.roomNumber, out byte _);
             r = LayoutType.UInt8.ReadFixed(row, root, this.roomNumber, tempOut__2);
@@ -1089,14 +1091,14 @@ public final class CodeGenRowGenerator {
             }
 
             boolean _;
-            OutObject<Boolean> tempOut__3 = new OutObject<Boolean>();
+            Out<Boolean> tempOut__3 = new Out<Boolean>();
             Result tempVar = LayoutType.Boolean.ReadFixed(row, root, this.isAvailable, tempOut__3);
             _ = tempOut__3.get();
             return tempVar;
         }
 
         @Override
-        public Result WriteBuffer(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+        public Result WriteBuffer(Reference<RowBuffer> row, Reference<RowCursor> root,
                                   HashMap<Utf8String, Object> tableValue) {
             for ((Utf8String key,Object value) :tableValue)
             {
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/JsonModelRowGenerator.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/JsonModelRowGenerator.java
index 4101d48..2485fc9 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/JsonModelRowGenerator.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/JsonModelRowGenerator.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.ISpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -52,10 +53,10 @@ public final class JsonModelRowGenerator {
     }
 
     public RowReader GetReader() {
-        RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(this.row);
+        Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(this.row);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         return new RowReader(ref this.row)
-        this.row = tempRef_row.get();
+        this.row = tempReference_row.get();
         return tempVar;
     }
 
@@ -77,25 +78,25 @@ public final class JsonModelRowGenerator {
     }
 
     public Result WriteBuffer(HashMap<Utf8String, Object> value) {
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(this.row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(this.row);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
-        Result tempVar = RowWriter.WriteBuffer(tempRef_row, value, (ref RowWriter writer, TypeArgument typeArg,
-                                                                    HashMap<Utf8String, Object> dict) ->
+        Result tempVar = RowWriter.WriteBuffer(tempReference_row, value, (ref RowWriter writer, TypeArgument typeArg,
+                                                                          HashMap<Utf8String, Object> dict) ->
         {
             for ((Utf8String propPath,Object propValue) :dict)
             {
-                RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer =
-                    new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer);
-                Result result = JsonModelRowGenerator.JsonModelSwitch(tempRef_writer, propPath, propValue);
-                writer = tempRef_writer.get();
+                Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer =
+                    new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer);
+                Result result = JsonModelRowGenerator.JsonModelSwitch(tempReference_writer, propPath, propValue);
+                writer = tempReference_writer.get();
                 return result;
             }
 
             return Result.Success;
         });
-        this.row = tempRef_row.get();
+        this.row = tempReference_row.get();
         return tempVar;
     }
 
@@ -111,7 +112,7 @@ public final class JsonModelRowGenerator {
         return varCopy;
     }
 
-    private static Result JsonModelSwitch(RefObject<RowWriter> writer, Utf8String path, Object value) {
+    private static Result JsonModelSwitch(Reference<RowWriter> writer, Utf8String path, Object value) {
         switch (value) {
             case null:
                 return writer.get().WriteNull(path);
@@ -161,9 +162,9 @@ public final class JsonModelRowGenerator {
                 {
                     for ((Utf8String propPath,Object propValue) :dict)
                     {
-                        RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer2 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer2);
-                        Result result = JsonModelRowGenerator.JsonModelSwitch(tempRef_writer2, propPath, propValue);
-                        writer2 = tempRef_writer2.get();
+                        Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer2 = new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer2);
+                        Result result = JsonModelRowGenerator.JsonModelSwitch(tempReference_writer2, propPath, propValue);
+                        writer2 = tempReference_writer2.get();
                         return result;
                     }
 
@@ -176,9 +177,9 @@ public final class JsonModelRowGenerator {
                 return writer.get().WriteScope(path, new TypeArgument(LayoutType.Array), x, (ref RowWriter writer2, TypeArgument typeArg, ArrayList<Object> list) ->
                 {
                     for (Object elm : list) {
-                        RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer2 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer2);
-                        Result result = JsonModelRowGenerator.JsonModelSwitch(tempRef_writer2, null, elm);
-                        writer2 = tempRef_writer2.get();
+                        Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer2 = new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer2);
+                        Result result = JsonModelRowGenerator.JsonModelSwitch(tempReference_writer2, null, elm);
+                        writer2 = tempReference_writer2.get();
                         if (result != Result.Success) {
                             return result;
                         }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/MicroBenchmarkSuiteBase.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/MicroBenchmarkSuiteBase.java
index 683aef8..662e7bf 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/MicroBenchmarkSuiteBase.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/MicroBenchmarkSuiteBase.java
@@ -5,7 +5,8 @@
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
 import JetBrains.Profiler.Api.*;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 
 import java.util.ArrayList;
 
@@ -27,7 +28,7 @@ public class MicroBenchmarkSuiteBase extends BenchmarkSuiteBase {
     // operation, string schema, string api, int innerLoopIterations, ref BenchmarkContext context,
     // BenchmarkBody<TValue> loopBody, BenchmarkMeasure<TValue> measure, List<TValue> expected)
     protected static <TValue> void Benchmark(String model, String operation, String schema, String api,
-                                             int innerLoopIterations, RefObject<BenchmarkContext> context,
+                                             int innerLoopIterations, Reference<BenchmarkContext> context,
                                              BenchmarkBody<TValue> loopBody, BenchmarkMeasure<TValue> measure,
                                              ArrayList<TValue> expected) {
         Stopwatch sw = new Stopwatch();
@@ -83,7 +84,7 @@ public class MicroBenchmarkSuiteBase extends BenchmarkSuiteBase {
     //ORIGINAL LINE: [MethodImpl(MethodImplOptions.NoInlining)] private static void BenchmarkInnerLoop<TValue>(int
     // innerLoopIterations, TValue tableValue, ref BenchmarkContext context, BenchmarkBody<TValue> loopBody)
     private static <TValue> void BenchmarkInnerLoop(int innerLoopIterations, TValue tableValue,
-                                                    RefObject<BenchmarkContext> context,
+                                                    Reference<BenchmarkContext> context,
                                                     BenchmarkBody<TValue> loopBody) {
         for (int innerLoop = 0; innerLoop < innerLoopIterations; innerLoop++) {
             loopBody.invoke(context, tableValue);
@@ -92,12 +93,12 @@ public class MicroBenchmarkSuiteBase extends BenchmarkSuiteBase {
 
     @FunctionalInterface
     public interface BenchmarkBody<TValue> {
-        void invoke(RefObject<BenchmarkContext> context, TValue value);
+        void invoke(Reference<BenchmarkContext> context, TValue value);
     }
 
     @FunctionalInterface
     public interface BenchmarkMeasure<TValue> {
-        long invoke(RefObject<BenchmarkContext> context, TValue value);
+        long invoke(Reference<BenchmarkContext> context, TValue value);
     }
 
     //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/ReaderBenchmark.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/ReaderBenchmark.java
index 11eb463..2c4ee95 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/ReaderBenchmark.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/ReaderBenchmark.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.MemorySpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -133,8 +134,8 @@ public final class ReaderBenchmark {
         }, segment ->
         {
             Segment _;
-            OutObject<Segment> tempOut__ =
-                new OutObject<Segment>();
+            Out<Segment> tempOut__ =
+                new Out<Segment>();
             r = SegmentSerializer.Read(segment.Span, context.getResolver(), tempOut__);
             _ = tempOut__.get();
             assert Result.Success == r;
@@ -150,10 +151,10 @@ public final class ReaderBenchmark {
     //ORIGINAL LINE: private static Result VisitOneRow(Memory<byte> buffer, LayoutResolver resolver)
     private static Result VisitOneRow(Memory<Byte> buffer, LayoutResolver resolver) {
         RowBuffer row = new RowBuffer(buffer.Span, HybridRowVersion.V1, resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row);
+        row = tempReference_row.get();
         return RowReaderExtensions.VisitReader(reader.clone());
     }
 
@@ -304,7 +305,7 @@ public final class ReaderBenchmark {
         private void DoWork() {
             while (!this.cancel.IsCancellationRequested) {
                 Task item;
-                OutObject<Task> tempOut_item = new OutObject<Task>();
+                Out<Task> tempOut_item = new Out<Task>();
                 if (this.tasks.TryDequeue(tempOut_item)) {
                     item = tempOut_item.get();
                     this.TryExecuteTask(item);
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/RowReaderExtensions.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/RowReaderExtensions.java
index a6687fe..c588522 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/RowReaderExtensions.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/RowReaderExtensions.java
@@ -4,13 +4,14 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.perf;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 
 import static com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutCode.ImmutableTagged2Scope;
 
 public final class RowReaderExtensions {
-    public static Result VisitReader(RefObject<RowReader> reader) {
+    public static Result VisitReader(Reference<RowReader> reader) {
         while (reader.get().Read()) {
             Utf8Span path = reader.get().getPathSpan();
             switch (reader.get().getType().LayoutCode) {
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/SchematizedMicroBenchmarkSuite.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/SchematizedMicroBenchmarkSuite.java
index c48c329..4c6f638 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/SchematizedMicroBenchmarkSuite.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/SchematizedMicroBenchmarkSuite.java
@@ -6,7 +6,8 @@ package com.azure.data.cosmos.serialization.hybridrow.perf;
 
 import MongoDB.Bson.IO.*;
 import Newtonsoft.Json.*;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -408,14 +409,14 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
         }
 
         BenchmarkContext ignoredContext = null;
-        RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+        Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "BSON",
         // innerLoopIterations, ref ignoredContext, (ref BenchmarkContext _, byte[] tableValue) =>
         MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "BSON", innerLoopIterations,
-            tempRef_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
+            tempReference_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
         {
             try (MemoryStream stm = new MemoryStream(tableValue)) {
                 try (BsonBinaryReader bsonReader = new BsonBinaryReader(stm)) {
@@ -423,7 +424,7 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
                 }
             }
         }, (ref BenchmarkContext _, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        ignoredContext = tempRef_ignoredContext.get();
+        ignoredContext = tempReference_ignoredContext.get();
     }
 
     private static void BsonWriteBenchmark(LayoutResolverNamespace resolver, String schemaName, String dataSetName,
@@ -433,16 +434,16 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
         try (BsonRowGenerator writer = new BsonRowGenerator(BenchmarkSuiteBase.InitialCapacity, layout, resolver)) {
             BenchmarkContext ignoredContext = null;
 
-            RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+            Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
             // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are
             // not converted by C# to Java Converter:
             MicroBenchmarkSuiteBase.Benchmark("Schematized", "Write", dataSetName, "BSON", innerLoopIterations,
-                tempRef_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) ->
+                tempReference_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) ->
             {
                 writer.Reset();
                 writer.WriteBuffer(tableValue);
             }, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) -> writer.getLength(), expected);
-            ignoredContext = tempRef_ignoredContext.get();
+            ignoredContext = tempReference_ignoredContext.get();
         }
     }
 
@@ -474,14 +475,14 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
         BenchmarkContext ignoredContext = null;
         jsonSerializer.Converters.Add(new Utf8StringJsonConverter());
 
-        RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+        Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "JSON",
         // innerLoopIterations, ref ignoredContext, (ref BenchmarkContext _, byte[] tableValue) =>
         MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "JSON", innerLoopIterations,
-            tempRef_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
+            tempReference_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
         {
             try (MemoryStream jsonStream = new MemoryStream(tableValue)) {
                 try (InputStreamReader textReader = new InputStreamReader(jsonStream)) {
@@ -493,7 +494,7 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
                 }
             }
         }, (ref BenchmarkContext _, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        ignoredContext = tempRef_ignoredContext.get();
+        ignoredContext = tempReference_ignoredContext.get();
     }
 
     private static void JsonWriteBenchmark(String dataSetName, int innerLoopIterations, ArrayList<HashMap<Utf8String,
@@ -506,18 +507,18 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
                     BenchmarkContext ignoredContext = null;
                     jsonSerializer.Converters.Add(new Utf8StringJsonConverter());
 
-                    RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+                    Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
                     // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword -
                     // these are not converted by C# to Java Converter:
                     MicroBenchmarkSuiteBase.Benchmark("Schematized", "Write", dataSetName, "JSON",
-                        innerLoopIterations, tempRef_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String,
+                        innerLoopIterations, tempReference_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String,
                             Object> tableValue) ->
                     {
                         jsonStream.SetLength(0);
                         jsonSerializer.Serialize(jsonWriter, tableValue);
                         jsonWriter.Flush();
                     }, (ref BenchmarkContext _, HashMap<Utf8String, Object> value) -> jsonStream.Length, expected);
-                    ignoredContext = tempRef_ignoredContext.get();
+                    ignoredContext = tempReference_ignoredContext.get();
                 }
             }
         }
@@ -544,20 +545,20 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
             expectedSerialized.add((Byte)context.StreamingWriter.ToArray());
         }
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "Layout",
         // innerLoopIterations, ref context, (ref BenchmarkContext ctx, byte[] tableValue) =>
         MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "Layout", innerLoopIterations,
-            tempRef_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
+            tempReference_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
         {
             VisitRowGenerator visitor = new VisitRowGenerator(tableValue.AsSpan(), resolver);
             Result r = visitor.DispatchLayout(layout);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void LayoutWriteBenchmark(LayoutResolverNamespace resolver, String schemaName, String dataSetName,
@@ -567,17 +568,17 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
         BenchmarkContext context = new BenchmarkContext();
         context.PatchWriter = new WriteRowGenerator(BenchmarkSuiteBase.InitialCapacity, layout, resolver);
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         MicroBenchmarkSuiteBase.Benchmark("Schematized", "Write", dataSetName, "Layout", innerLoopIterations,
-            tempRef_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> dict) ->
+            tempReference_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> dict) ->
         {
             ctx.PatchWriter.Reset();
             Result r = ctx.PatchWriter.DispatchLayout(layout, dict);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> _) -> ctx.PatchWriter.Length, expected);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void StreamingReadBenchmark(LayoutResolverNamespace resolver, String schemaName, String dataSetName, int innerLoopIterations, ArrayList<HashMap<Utf8String, Object>> expected) {
@@ -599,19 +600,20 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
             expectedSerialized.add((Byte)context.StreamingWriter.ToArray());
         }
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "HybridRow", innerLoopIterations, ref context, (ref BenchmarkContext ctx, byte[] tableValue) =>
-        MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "HybridRow", innerLoopIterations, tempRef_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
+        MicroBenchmarkSuiteBase.Benchmark("Schematized", "Read", dataSetName, "HybridRow", innerLoopIterations,
+            tempReference_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
         {
             RowBuffer row = new RowBuffer(tableValue.AsSpan(), HybridRowVersion.V1, resolver);
-            RefObject<RowBuffer> tempRef_row = new RefObject<RowBuffer>(row);
-            RowReader reader = new RowReader(tempRef_row);
-            row = tempRef_row.get();
+            Reference<RowBuffer> tempReference_row = new Reference<RowBuffer>(row);
+            RowReader reader = new RowReader(tempReference_row);
+            row = tempReference_row.get();
             RowReaderExtensions.VisitReader(reader.clone());
         }, (ref BenchmarkContext ctx, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void StreamingWriteBenchmark(LayoutResolverNamespace resolver, String schemaName,
@@ -622,17 +624,17 @@ public final class SchematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteBas
         BenchmarkContext context = new BenchmarkContext();
         context.StreamingWriter = new StreamingRowGenerator(BenchmarkSuiteBase.InitialCapacity, layout, resolver);
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         MicroBenchmarkSuiteBase.Benchmark("Schematized", "Write", dataSetName, "HybridRow", innerLoopIterations,
-            tempRef_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
+            tempReference_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
         {
             ctx.StreamingWriter.Reset();
 
             Result r = ctx.StreamingWriter.WriteBuffer(tableValue);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> _) -> ctx.StreamingWriter.Length, expected);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/UnschematizedMicroBenchmarkSuite.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/UnschematizedMicroBenchmarkSuite.java
index 098d2de..d003332 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/UnschematizedMicroBenchmarkSuite.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/perf/UnschematizedMicroBenchmarkSuite.java
@@ -6,7 +6,7 @@ package com.azure.data.cosmos.serialization.hybridrow.perf;
 
 import MongoDB.Bson.IO.*;
 import Newtonsoft.Json.*;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -165,11 +165,11 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
         }
 
         BenchmarkContext ignoredContext = null;
-        RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+        Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Unschematized", "Read", dataSetName, "BSON", innerLoopIterations, ref ignoredContext, (ref BenchmarkContext _, byte[] tableValue) =>
-        Benchmark("Unschematized", "Read", dataSetName, "BSON", innerLoopIterations, tempRef_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
+        Benchmark("Unschematized", "Read", dataSetName, "BSON", innerLoopIterations, tempReference_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
         {
             try (MemoryStream stm = new MemoryStream(tableValue)) {
                 try (BsonBinaryReader bsonReader = new BsonBinaryReader(stm)) {
@@ -177,7 +177,7 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
                 }
             }
         }, (ref BenchmarkContext _, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        ignoredContext = tempRef_ignoredContext.get();
+        ignoredContext = tempReference_ignoredContext.get();
     }
 
     private static void BsonWriteBenchmark(String dataSetName, int innerLoopIterations, ArrayList<HashMap<Utf8String,
@@ -185,16 +185,16 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
         try (BsonJsonModelRowGenerator writer = new BsonJsonModelRowGenerator(InitialCapacity)) {
             BenchmarkContext ignoredContext = null;
 
-            RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+            Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
             // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are
             // not converted by C# to Java Converter:
             Benchmark("Unschematized", "Write", dataSetName, "BSON", innerLoopIterations,
-                tempRef_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) ->
+                tempReference_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) ->
             {
                 writer.Reset();
                 writer.WriteBuffer(tableValue);
             }, (ref BenchmarkContext _, HashMap<Utf8String, Object> tableValue) -> writer.getLength(), expected);
-            ignoredContext = tempRef_ignoredContext.get();
+            ignoredContext = tempReference_ignoredContext.get();
         }
     }
 
@@ -220,23 +220,23 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
             expectedSerialized.add(context.JsonModelWriter.ToArray());
         }
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Unschematized", "Read", dataSetName, "HybridRowSparse",
         // innerLoopIterations, ref context, (ref BenchmarkContext ctx, byte[] tableValue) =>
         Benchmark("Unschematized", "Read", dataSetName, "HybridRowSparse",
-            innerLoopIterations, tempRef_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
+            innerLoopIterations, tempReference_context, (ref BenchmarkContext ctx, byte[] tableValue) ->
         {
             RowBuffer row = new RowBuffer(tableValue.AsSpan(), HybridRowVersion.V1, resolver);
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(row);
-            RowReader reader = new RowReader(tempRef_row);
-            row = tempRef_row.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(row);
+            RowReader reader = new RowReader(tempReference_row);
+            row = tempReference_row.get();
             RowReaderExtensions.VisitReader(reader.clone());
         }, (ref BenchmarkContext ctx, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void JsonModelWriteBenchmark(LayoutResolverNamespace resolver, String schemaName,
@@ -247,18 +247,18 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
         BenchmarkContext context = new BenchmarkContext();
         context.JsonModelWriter = new JsonModelRowGenerator(InitialCapacity, layout, resolver);
 
-        RefObject<BenchmarkContext> tempRef_context = new RefObject<BenchmarkContext>(context);
+        Reference<BenchmarkContext> tempReference_context = new Reference<BenchmarkContext>(context);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         Benchmark("Unschematized", "Write", dataSetName, "HybridRowSparse",
-            innerLoopIterations, tempRef_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
+            innerLoopIterations, tempReference_context, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) ->
         {
             ctx.JsonModelWriter.Reset();
 
             Result r = ctx.JsonModelWriter.WriteBuffer(tableValue);
             ResultAssert.IsSuccess(r);
         }, (ref BenchmarkContext ctx, HashMap<Utf8String, Object> tableValue) -> ctx.JsonModelWriter.Length, expected);
-        context = tempRef_context.get();
+        context = tempReference_context.get();
     }
 
     private static void JsonReadBenchmark(String dataSetName, int innerLoopIterations, ArrayList<HashMap<Utf8String,
@@ -289,14 +289,14 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
         BenchmarkContext ignoredContext = null;
         jsonSerializer.Converters.Add(new Utf8StringJsonConverter());
 
-        RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+        Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: MicroBenchmarkSuiteBase.Benchmark("Unschematized", "Read", dataSetName, "JSON",
         // innerLoopIterations, ref ignoredContext, (ref BenchmarkContext _, byte[] tableValue) =>
         Benchmark("Unschematized", "Read", dataSetName, "JSON", innerLoopIterations,
-            tempRef_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
+            tempReference_ignoredContext, (ref BenchmarkContext _, byte[] tableValue) ->
         {
             try (MemoryStream jsonStream = new MemoryStream(tableValue)) {
                 try (InputStreamReader textReader = new InputStreamReader(jsonStream)) {
@@ -308,7 +308,7 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
                 }
             }
         }, (ref BenchmarkContext _, byte[] tableValue) -> tableValue.length, expectedSerialized);
-        ignoredContext = tempRef_ignoredContext.get();
+        ignoredContext = tempReference_ignoredContext.get();
     }
 
     private static void JsonWriteBenchmark(String dataSetName, int innerLoopIterations, ArrayList<HashMap<Utf8String,
@@ -321,18 +321,18 @@ public final class UnschematizedMicroBenchmarkSuite extends MicroBenchmarkSuiteB
                     BenchmarkContext ignoredContext = null;
                     jsonSerializer.Converters.Add(new Utf8StringJsonConverter());
 
-                    RefObject<BenchmarkContext> tempRef_ignoredContext = new RefObject<BenchmarkContext>(ignoredContext);
+                    Reference<BenchmarkContext> tempReference_ignoredContext = new Reference<BenchmarkContext>(ignoredContext);
                     // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword -
                     // these are not converted by C# to Java Converter:
                     Benchmark("Unschematized", "Write", dataSetName, "JSON",
-                        innerLoopIterations, tempRef_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String,
+                        innerLoopIterations, tempReference_ignoredContext, (ref BenchmarkContext _, HashMap<Utf8String,
                             Object> tableValue) ->
                     {
                         jsonStream.SetLength(0);
                         jsonSerializer.Serialize(jsonWriter, tableValue);
                         jsonWriter.Flush();
                     }, (ref BenchmarkContext _, HashMap<Utf8String, Object> value) -> jsonStream.Length, expected);
-                    ignoredContext = tempRef_ignoredContext.get();
+                    ignoredContext = tempReference_ignoredContext.get();
                 }
             }
         }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CrossVersioningUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CrossVersioningUnitTests.java
index 5525df0..751ebb3 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CrossVersioningUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CrossVersioningUnitTests.java
@@ -5,7 +5,8 @@
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
 import Newtonsoft.Json.*;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
@@ -578,7 +579,7 @@ public final class CrossVersioningUnitTests {
             this.Y = y;
         }
 
-        public void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope) {
+        public void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope) {
             dispatcher.get().LayoutCodeSwitch(scope, "x", value:this.X)
             dispatcher.get().LayoutCodeSwitch(scope, "y", value:this.Y)
         }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CustomerExampleUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CustomerExampleUnitTests.java
index 42ec77f..5ff7c7d 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CustomerExampleUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/CustomerExampleUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -67,115 +68,115 @@ public final class CustomerExampleUnitTests {
         tempVar.setPostalCode(tempVar2);
         g1.Addresses = new HashMap<String, Address>(Map.ofEntries(Map.entry("home", tempVar)));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc1 = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc1 =
-            new RefObject<RowCursor>(rc1);
-        this.WriteGuest(tempRef_row2, tempRef_rc1, g1);
-        rc1 = tempRef_rc1.get();
-        row = tempRef_row2.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc2 = RowCursor.Create(tempRef_row3);
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc2 =
-            new RefObject<RowCursor>(rc2);
-        Guest g2 = this.ReadGuest(tempRef_row4, tempRef_rc2);
-        rc2 = tempRef_rc2.get();
-        row = tempRef_row4.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor rc1 = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc1 =
+            new Reference<RowCursor>(rc1);
+        this.WriteGuest(tempReference_row2, tempReference_rc1, g1);
+        rc1 = tempReference_rc1.get();
+        row = tempReference_row2.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc2 = RowCursor.Create(tempReference_row3);
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc2 =
+            new Reference<RowCursor>(rc2);
+        Guest g2 = this.ReadGuest(tempReference_row4, tempReference_rc2);
+        rc2 = tempReference_rc2.get();
+        row = tempReference_row4.get();
         assert g1 == g2;
 
         // Append an item to an existing list.
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc3 = RowCursor.Create(tempRef_row5);
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc3 =
-            new RefObject<RowCursor>(rc3);
-        int index = this.AppendGuestEmail(tempRef_row6, tempRef_rc3, "vice_president@whitehouse.gov");
-        rc3 = tempRef_rc3.get();
-        row = tempRef_row6.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc3 = RowCursor.Create(tempReference_row5);
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc3 =
+            new Reference<RowCursor>(rc3);
+        int index = this.AppendGuestEmail(tempReference_row6, tempReference_rc3, "vice_president@whitehouse.gov");
+        rc3 = tempReference_rc3.get();
+        row = tempReference_row6.get();
         assert 1 == index;
         g1.Emails.add("vice_president@whitehouse.gov");
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc4 = RowCursor.Create(tempRef_row7);
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc4 =
-            new RefObject<RowCursor>(rc4);
-        g2 = this.ReadGuest(tempRef_row8, tempRef_rc4);
-        rc4 = tempRef_rc4.get();
-        row = tempRef_row8.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc4 = RowCursor.Create(tempReference_row7);
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc4 =
+            new Reference<RowCursor>(rc4);
+        g2 = this.ReadGuest(tempReference_row8, tempReference_rc4);
+        rc4 = tempReference_rc4.get();
+        row = tempReference_row8.get();
         assert g1 == g2;
 
         // Prepend an item to an existing list.
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc5 = RowCursor.Create(tempRef_row9);
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc5 =
-            new RefObject<RowCursor>(rc5);
-        index = this.PrependGuestEmail(tempRef_row10, tempRef_rc5, "ex_president@whitehouse.gov");
-        rc5 = tempRef_rc5.get();
-        row = tempRef_row10.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc5 = RowCursor.Create(tempReference_row9);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc5 =
+            new Reference<RowCursor>(rc5);
+        index = this.PrependGuestEmail(tempReference_row10, tempReference_rc5, "ex_president@whitehouse.gov");
+        rc5 = tempReference_rc5.get();
+        row = tempReference_row10.get();
         assert 0 == index;
         g1.Emails = new TreeSet<String> {
             "ex_president@whitehouse.gov", "president@whitehouse.gov", "vice_president@whitehouse.gov"
         }
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc6 = RowCursor.Create(tempRef_row11);
-        row = tempRef_row11.get();
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc6 =
-            new RefObject<RowCursor>(rc6);
-        g2 = this.ReadGuest(tempRef_row12, tempRef_rc6);
-        rc6 = tempRef_rc6.get();
-        row = tempRef_row12.get();
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc6 = RowCursor.Create(tempReference_row11);
+        row = tempReference_row11.get();
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc6 =
+            new Reference<RowCursor>(rc6);
+        g2 = this.ReadGuest(tempReference_row12, tempReference_rc6);
+        rc6 = tempReference_rc6.get();
+        row = tempReference_row12.get();
         assert g1 == g2;
 
         // InsertAt an item to an existing list.
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc7 = RowCursor.Create(tempRef_row13);
-        row = tempRef_row13.get();
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc7 =
-            new RefObject<RowCursor>(rc7);
-        index = this.InsertAtGuestEmail(tempRef_row14, tempRef_rc7, 1, "future_president@whitehouse.gov");
-        rc7 = tempRef_rc7.get();
-        row = tempRef_row14.get();
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc7 = RowCursor.Create(tempReference_row13);
+        row = tempReference_row13.get();
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc7 =
+            new Reference<RowCursor>(rc7);
+        index = this.InsertAtGuestEmail(tempReference_row14, tempReference_rc7, 1, "future_president@whitehouse.gov");
+        rc7 = tempReference_rc7.get();
+        row = tempReference_row14.get();
         assert 1 == index;
         g1.Emails = new TreeSet<String> {
             "ex_president@whitehouse.gov", "future_president@whitehouse.gov", "president@whitehouse.gov",
                 "vice_president@whitehouse.gov"
         }
 
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc8 = RowCursor.Create(tempRef_row15);
-        row = tempRef_row15.get();
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc8 =
-            new RefObject<RowCursor>(rc8);
-        g2 = this.ReadGuest(tempRef_row16, tempRef_rc8);
-        rc8 = tempRef_rc8.get();
-        row = tempRef_row16.get();
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc8 = RowCursor.Create(tempReference_row15);
+        row = tempReference_row15.get();
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc8 =
+            new Reference<RowCursor>(rc8);
+        g2 = this.ReadGuest(tempReference_row16, tempReference_rc8);
+        rc8 = tempReference_rc8.get();
+        row = tempReference_row16.get();
         assert g1 == g2;
     }
 
@@ -186,29 +187,29 @@ public final class CustomerExampleUnitTests {
         row.InitLayout(HybridRowVersion.V1, this.hotelLayout, this.customerResolver);
 
         Hotel h1 = this.hotelExample;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_root =
-            new RefObject<RowCursor>(root);
-        this.WriteHotel(tempRef_row2, tempRef_root, h1);
-        root = tempRef_root.get();
-        row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_root =
+            new Reference<RowCursor>(root);
+        this.WriteHotel(tempReference_row2, tempReference_root, h1);
+        root = tempReference_root.get();
+        row = tempReference_row2.get();
 
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        root = RowCursor.Create(tempRef_row3);
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_root2 =
-            new RefObject<RowCursor>(root);
-        Hotel h2 = this.ReadHotel(tempRef_row4, tempRef_root2);
-        root = tempRef_root2.get();
-        row = tempRef_row4.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        root = RowCursor.Create(tempReference_row3);
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_root2 =
+            new Reference<RowCursor>(root);
+        Hotel h2 = this.ReadHotel(tempReference_row4, tempReference_root2);
+        root = tempReference_root2.get();
+        row = tempReference_row4.get();
 
         assert h1 == h2;
     }
@@ -220,31 +221,31 @@ public final class CustomerExampleUnitTests {
         row.InitLayout(HybridRowVersion.V1, this.hotelLayout, this.customerResolver);
 
         Hotel h1 = this.hotelExample;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_root =
-            new RefObject<RowCursor>(root);
-        this.WriteHotel(tempRef_row2, tempRef_root, h1);
-        root = tempRef_root.get();
-        row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_root =
+            new Reference<RowCursor>(root);
+        this.WriteHotel(tempReference_row2, tempReference_root, h1);
+        root = tempReference_root.get();
+        row = tempReference_row2.get();
 
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        root = RowCursor.Create(tempRef_row3);
-        row = tempRef_row3.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        root = RowCursor.Create(tempReference_row3);
+        row = tempReference_row3.get();
         Address tempVar = new Address();
         tempVar.setStreet("300B Brownie Way");
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_root2 =
-            new RefObject<RowCursor>(root);
-        ResultAssert.InsufficientPermissions(this.PartialUpdateHotelAddress(tempRef_row4, tempRef_root2, tempVar));
-        root = tempRef_root2.get();
-        row = tempRef_row4.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_root2 =
+            new Reference<RowCursor>(root);
+        ResultAssert.InsufficientPermissions(this.PartialUpdateHotelAddress(tempReference_row4, tempReference_root2, tempVar));
+        root = tempReference_root2.get();
+        row = tempReference_row4.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -259,52 +260,52 @@ public final class CustomerExampleUnitTests {
             x -> x.Name.equals("Guests")).SchemaId);
     }
 
-    private int AppendGuestEmail(RefObject<RowBuffer> row, RefObject<RowCursor> root, String email) {
+    private int AppendGuestEmail(Reference<RowBuffer> row, Reference<RowCursor> root, String email) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("emails", out c);
         root.get().Find(row, c.Path);
         RowCursor emailScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().ReadScope(row, root, out emailScope));
         assert !emailScope.MoveTo(row, Integer.MAX_VALUE);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref emailScope, email));
         return emailScope.Index;
     }
 
-    private int InsertAtGuestEmail(RefObject<RowBuffer> row, RefObject<RowCursor> root, int i,
+    private int InsertAtGuestEmail(Reference<RowBuffer> row, Reference<RowCursor> root, int i,
                                    String email) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("emails", out c);
         root.get().Find(row, c.Path);
         RowCursor emailScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().ReadScope(row, root, out emailScope));
         assert emailScope.MoveTo(row, i);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref emailScope, email,
             UpdateOptions.InsertAt));
         return emailScope.Index;
     }
 
-    private Result PartialUpdateHotelAddress(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    private Result PartialUpdateHotelAddress(Reference<RowBuffer> row, Reference<RowCursor> root,
                                              Address a) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("address", out c);
         root.get().Find(row, c.Path);
         RowCursor addressScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = c.<LayoutUDT>TypeAs().ReadScope(row, root, out addressScope);
         if (r != Result.Success) {
             return r;
@@ -313,11 +314,11 @@ public final class CustomerExampleUnitTests {
         Layout addressLayout = addressScope.Layout;
         if (a.Street != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert addressLayout.TryFind("street", out c);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = c.<LayoutUtf8>TypeAs().WriteVariable(row, ref addressScope, c, a.Street);
             if (r != Result.Success) {
@@ -327,11 +328,11 @@ public final class CustomerExampleUnitTests {
 
         if (a.City != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert addressLayout.TryFind("city", out c);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = c.<LayoutUtf8>TypeAs().WriteVariable(row, ref addressScope, c, a.City);
             if (r != Result.Success) {
@@ -341,11 +342,11 @@ public final class CustomerExampleUnitTests {
 
         if (a.State != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert addressLayout.TryFind("state", out c);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = c.<LayoutUtf8>TypeAs().WriteFixed(row, ref addressScope, c, a.State);
             if (r != Result.Success) {
@@ -355,145 +356,145 @@ public final class CustomerExampleUnitTests {
 
         if (a.PostalCode != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert addressLayout.TryFind("postal_code", out c);
             addressScope.Find(row, c.Path);
             RowCursor postalCodeScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = c.<LayoutUDT>TypeAs().WriteScope(row, ref addressScope, c.TypeArgs, out postalCodeScope);
             if (r != Result.Success) {
                 return r;
             }
 
-            RefObject<RowCursor> tempRef_postalCodeScope =
-                new RefObject<RowCursor>(postalCodeScope);
-            this.WritePostalCode(row, tempRef_postalCodeScope, c.TypeArgs, a.PostalCode);
-            postalCodeScope = tempRef_postalCodeScope.get();
+            Reference<RowCursor> tempReference_postalCodeScope =
+                new Reference<RowCursor>(postalCodeScope);
+            this.WritePostalCode(row, tempReference_postalCodeScope, c.TypeArgs, a.PostalCode);
+            postalCodeScope = tempReference_postalCodeScope.get();
         }
 
         return Result.Success;
     }
 
-    private int PrependGuestEmail(RefObject<RowBuffer> row, RefObject<RowCursor> root, String email) {
+    private int PrependGuestEmail(Reference<RowBuffer> row, Reference<RowCursor> root, String email) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("emails", out c);
         root.get().Find(row, c.Path);
         RowCursor emailScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().ReadScope(row, root, out emailScope));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref emailScope, email,
             UpdateOptions.InsertAt));
         return emailScope.Index;
     }
 
-    private static Address ReadAddress(RefObject<RowBuffer> row, RefObject<RowCursor> addressScope) {
+    private static Address ReadAddress(Reference<RowBuffer> row, Reference<RowCursor> addressScope) {
         Address a = new Address();
         Layout addressLayout = addressScope.get().getLayout();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("street", out c);
-        OutObject<String> tempOut_Street = new OutObject<String>();
+        Out<String> tempOut_Street = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, addressScope, c, tempOut_Street));
         a.Street = tempOut_Street.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("city", out c);
-        OutObject<String> tempOut_City = new OutObject<String>();
+        Out<String> tempOut_City = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, addressScope, c, tempOut_City));
         a.City = tempOut_City.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("state", out c);
-        OutObject<String> tempOut_State = new OutObject<String>();
+        Out<String> tempOut_State = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadFixed(row, addressScope, c, tempOut_State));
         a.State = tempOut_State.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("postal_code", out c);
         addressScope.get().Find(row, c.Path);
         RowCursor postalCodeScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutUDT>TypeAs().ReadScope(row, addressScope, out postalCodeScope));
-        RefObject<RowCursor> tempRef_postalCodeScope =
-            new RefObject<RowCursor>(postalCodeScope);
-        a.PostalCode = CustomerExampleUnitTests.ReadPostalCode(row, tempRef_postalCodeScope);
-        postalCodeScope = tempRef_postalCodeScope.get();
-        RefObject<RowCursor> tempRef_postalCodeScope2 =
-            new RefObject<RowCursor>(postalCodeScope);
+        Reference<RowCursor> tempReference_postalCodeScope =
+            new Reference<RowCursor>(postalCodeScope);
+        a.PostalCode = CustomerExampleUnitTests.ReadPostalCode(row, tempReference_postalCodeScope);
+        postalCodeScope = tempReference_postalCodeScope.get();
+        Reference<RowCursor> tempReference_postalCodeScope2 =
+            new Reference<RowCursor>(postalCodeScope);
         RowCursorExtensions.Skip(addressScope.get().clone(), row,
-            tempRef_postalCodeScope2);
-        postalCodeScope = tempRef_postalCodeScope2.get();
+            tempReference_postalCodeScope2);
+        postalCodeScope = tempReference_postalCodeScope2.get();
         return a;
     }
 
-    private Guest ReadGuest(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Guest ReadGuest(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Guest g = new Guest();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("guest_id", out c);
-        OutObject<UUID> tempOut_Id = new OutObject<UUID>();
+        Out<UUID> tempOut_Id = new Out<UUID>();
         ResultAssert.IsSuccess(c.<LayoutGuid>TypeAs().ReadFixed(row, root, c, tempOut_Id));
         g.Id = tempOut_Id.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("first_name", out c);
-        OutObject<String> tempOut_FirstName = new OutObject<String>();
+        Out<String> tempOut_FirstName = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_FirstName));
         g.FirstName = tempOut_FirstName.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("last_name", out c);
-        OutObject<String> tempOut_LastName = new OutObject<String>();
+        Out<String> tempOut_LastName = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_LastName));
         g.LastName = tempOut_LastName.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("title", out c);
-        OutObject<String> tempOut_Title = new OutObject<String>();
+        Out<String> tempOut_Title = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Title));
         g.Title = tempOut_Title.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("confirm_number", out c);
-        OutObject<String> tempOut_ConfirmNumber = new OutObject<String>();
+        Out<String> tempOut_ConfirmNumber = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_ConfirmNumber));
         g.ConfirmNumber = tempOut_ConfirmNumber.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("emails", out c);
         RowCursor emailScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out emailScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref emailScope, out emailScope) == Result.Success) {
             g.Emails = new TreeSet<String>();
             while (emailScope.MoveNext(row)) {
                 String item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref emailScope,
                     out item));
@@ -502,25 +503,25 @@ public final class CustomerExampleUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("phone_numbers", out c);
         RowCursor phoneNumbersScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out phoneNumbersScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref phoneNumbersScope, out phoneNumbersScope) == Result.Success) {
             g.PhoneNumbers = new ArrayList<String>();
             while (phoneNumbersScope.MoveNext(row)) {
                 String item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref phoneNumbersScope,
                     out item));
@@ -529,121 +530,122 @@ public final class CustomerExampleUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("addresses", out c);
         RowCursor addressesScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out addressesScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedMap>TypeAs().ReadScope(row, ref addressesScope, out addressesScope) == Result.Success) {
-            RefObject<RowCursor> tempRef_addressesScope = new RefObject<RowCursor>(addressesScope);
-            TypeArgument tupleType = LayoutType.TypedMap.FieldType(tempRef_addressesScope).clone();
-            addressesScope = tempRef_addressesScope.get();
+            Reference<RowCursor> tempReference_addressesScope = new Reference<RowCursor>(addressesScope);
+            TypeArgument tupleType = LayoutType.TypedMap.FieldType(tempReference_addressesScope).clone();
+            addressesScope = tempReference_addressesScope.get();
             TypeArgument t0 = tupleType.getTypeArgs().get(0).clone();
             TypeArgument t1 = tupleType.getTypeArgs().get(1).clone();
             g.Addresses = new HashMap<String, Address>();
             RowCursor pairScope = null;
-            RefObject<RowCursor> tempRef_pairScope = new RefObject<RowCursor>(pairScope);
-            while (addressesScope.MoveNext(row, tempRef_pairScope)) {
-                pairScope = tempRef_pairScope.get();
-                RefObject<RowCursor> tempRef_addressesScope2 = new RefObject<RowCursor>(addressesScope);
-                OutObject<RowCursor> tempOut_pairScope = new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row, tempRef_addressesScope2, tempOut_pairScope));
+            Reference<RowCursor> tempReference_pairScope = new Reference<RowCursor>(pairScope);
+            while (addressesScope.MoveNext(row, tempReference_pairScope)) {
+                pairScope = tempReference_pairScope.get();
+                Reference<RowCursor> tempReference_addressesScope2 = new Reference<RowCursor>(addressesScope);
+                Out<RowCursor> tempOut_pairScope = new Out<RowCursor>();
+                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row,
+                    tempReference_addressesScope2, tempOut_pairScope));
                 pairScope = tempOut_pairScope.get();
-                addressesScope = tempRef_addressesScope2.get();
+                addressesScope = tempReference_addressesScope2.get();
                 assert RowCursorExtensions.MoveNext(pairScope.clone(), row);
-                RefObject<RowCursor> tempRef_pairScope2 = new RefObject<RowCursor>(pairScope);
+                Reference<RowCursor> tempReference_pairScope2 = new Reference<RowCursor>(pairScope);
                 String key;
-                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-                ResultAssert.IsSuccess(t0.<LayoutUtf8>TypeAs().ReadSparse(row, tempRef_pairScope2, out key));
-                pairScope = tempRef_pairScope2.get();
+                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+                ResultAssert.IsSuccess(t0.<LayoutUtf8>TypeAs().ReadSparse(row, tempReference_pairScope2, out key));
+                pairScope = tempReference_pairScope2.get();
                 assert RowCursorExtensions.MoveNext(pairScope.clone(), row);
-                RefObject<RowCursor> tempRef_pairScope3 = new RefObject<RowCursor>(pairScope);
+                Reference<RowCursor> tempReference_pairScope3 = new Reference<RowCursor>(pairScope);
                 RowCursor addressScope;
-                OutObject<RowCursor> tempOut_addressScope = new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(t1.<LayoutUDT>TypeAs().ReadScope(row, tempRef_pairScope3, tempOut_addressScope));
+                Out<RowCursor> tempOut_addressScope = new Out<RowCursor>();
+                ResultAssert.IsSuccess(t1.<LayoutUDT>TypeAs().ReadScope(row, tempReference_pairScope3, tempOut_addressScope));
                 addressScope = tempOut_addressScope.get();
-                pairScope = tempRef_pairScope3.get();
-                RefObject<RowCursor> tempRef_addressScope = new RefObject<RowCursor>(addressScope);
-                Address value = CustomerExampleUnitTests.ReadAddress(row, tempRef_addressScope);
-                addressScope = tempRef_addressScope.get();
+                pairScope = tempReference_pairScope3.get();
+                Reference<RowCursor> tempReference_addressScope = new Reference<RowCursor>(addressScope);
+                Address value = CustomerExampleUnitTests.ReadAddress(row, tempReference_addressScope);
+                addressScope = tempReference_addressScope.get();
                 g.Addresses.put(key, value);
-                RefObject<RowCursor> tempRef_addressScope2 = new RefObject<RowCursor>(addressScope);
-                assert !RowCursorExtensions.MoveNext(pairScope.clone(), row, tempRef_addressScope2);
-                addressScope = tempRef_addressScope2.get();
+                Reference<RowCursor> tempReference_addressScope2 = new Reference<RowCursor>(addressScope);
+                assert !RowCursorExtensions.MoveNext(pairScope.clone(), row, tempReference_addressScope2);
+                addressScope = tempReference_addressScope2.get();
             }
-            pairScope = tempRef_pairScope.get();
+            pairScope = tempReference_pairScope.get();
         }
 
         return g;
     }
 
-    private Hotel ReadHotel(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Hotel ReadHotel(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Hotel h = new Hotel();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("hotel_id", out c);
-        OutObject<String> tempOut_Id = new OutObject<String>();
+        Out<String> tempOut_Id = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Id));
         h.Id = tempOut_Id.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("name", out c);
-        OutObject<String> tempOut_Name = new OutObject<String>();
+        Out<String> tempOut_Name = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Name));
         h.Name = tempOut_Name.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("phone", out c);
-        OutObject<String> tempOut_Phone = new OutObject<String>();
+        Out<String> tempOut_Phone = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Phone));
         h.Phone = tempOut_Phone.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("address", out c);
         assert c.Type.Immutable;
         root.get().Find(row, c.Path);
         RowCursor addressScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutUDT>TypeAs().ReadScope(row, root, out addressScope));
         assert addressScope.Immutable;
-        RefObject<RowCursor> tempRef_addressScope =
-            new RefObject<RowCursor>(addressScope);
-        h.Address = CustomerExampleUnitTests.ReadAddress(row, tempRef_addressScope);
-        addressScope = tempRef_addressScope.get();
-        RefObject<RowCursor> tempRef_addressScope2 =
-            new RefObject<RowCursor>(addressScope);
+        Reference<RowCursor> tempReference_addressScope =
+            new Reference<RowCursor>(addressScope);
+        h.Address = CustomerExampleUnitTests.ReadAddress(row, tempReference_addressScope);
+        addressScope = tempReference_addressScope.get();
+        Reference<RowCursor> tempReference_addressScope2 =
+            new Reference<RowCursor>(addressScope);
         RowCursorExtensions.Skip(root.get().clone(), row,
-            tempRef_addressScope2);
-        addressScope = tempRef_addressScope2.get();
+            tempReference_addressScope2);
+        addressScope = tempReference_addressScope2.get();
         return h;
     }
 
-    private static PostalCode ReadPostalCode(RefObject<RowBuffer> row,
-                                             RefObject<RowCursor> postalCodeScope) {
+    private static PostalCode ReadPostalCode(Reference<RowBuffer> row,
+                                             Reference<RowCursor> postalCodeScope) {
         Layout postalCodeLayout = postalCodeScope.get().getLayout();
         PostalCode pc = new PostalCode();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert postalCodeLayout.TryFind("zip", out c);
-        OutObject<Integer> tempOut_Zip = new OutObject<Integer>();
+        Out<Integer> tempOut_Zip = new Out<Integer>();
         ResultAssert.IsSuccess(c.<LayoutInt32>TypeAs().ReadFixed(row, postalCodeScope, c, tempOut_Zip));
         pc.Zip = tempOut_Zip.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert postalCodeLayout.TryFind("plus4", out c);
         postalCodeScope.get().Find(row, c.Path);
         short plus4;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         if (c.<LayoutInt16>TypeAs().ReadSparse(row, postalCodeScope, out plus4) == Result.Success) {
             pc.Plus4 = plus4;
         }
@@ -651,132 +653,132 @@ public final class CustomerExampleUnitTests {
         return pc;
     }
 
-    private void WriteAddress(RefObject<RowBuffer> row, RefObject<RowCursor> addressScope,
+    private void WriteAddress(Reference<RowBuffer> row, Reference<RowCursor> addressScope,
                               TypeArgumentList typeArgs, Address a) {
         Layout addressLayout = this.customerResolver.Resolve(typeArgs.getSchemaId().clone());
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("street", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, addressScope, c, a.Street));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("city", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, addressScope, c, a.City));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("state", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteFixed(row, addressScope, c, a.State));
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert addressLayout.TryFind("postal_code", out c);
         addressScope.get().Find(row, c.Path);
         RowCursor postalCodeScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutUDT>TypeAs().WriteScope(row, addressScope, c.TypeArgs, out postalCodeScope));
-        RefObject<RowCursor> tempRef_postalCodeScope =
-            new RefObject<RowCursor>(postalCodeScope);
-        this.WritePostalCode(row, tempRef_postalCodeScope, c.TypeArgs, a.PostalCode);
-        postalCodeScope = tempRef_postalCodeScope.get();
-        RefObject<RowCursor> tempRef_postalCodeScope2 =
-            new RefObject<RowCursor>(postalCodeScope);
+        Reference<RowCursor> tempReference_postalCodeScope =
+            new Reference<RowCursor>(postalCodeScope);
+        this.WritePostalCode(row, tempReference_postalCodeScope, c.TypeArgs, a.PostalCode);
+        postalCodeScope = tempReference_postalCodeScope.get();
+        Reference<RowCursor> tempReference_postalCodeScope2 =
+            new Reference<RowCursor>(postalCodeScope);
         RowCursorExtensions.Skip(addressScope.get().clone(), row,
-            tempRef_postalCodeScope2);
-        postalCodeScope = tempRef_postalCodeScope2.get();
+            tempReference_postalCodeScope2);
+        postalCodeScope = tempReference_postalCodeScope2.get();
     }
 
-    private void WriteGuest(RefObject<RowBuffer> row, RefObject<RowCursor> root, Guest g) {
+    private void WriteGuest(Reference<RowBuffer> row, Reference<RowCursor> root, Guest g) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("guest_id", out c);
         ResultAssert.IsSuccess(c.<LayoutGuid>TypeAs().WriteFixed(row, root, c, g.Id));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("first_name", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, g.FirstName));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("last_name", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, g.LastName));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("title", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, g.Title));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.guestLayout.TryFind("confirm_number", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, g.ConfirmNumber));
 
         if (g.Emails != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.guestLayout.TryFind("emails", out c);
             root.get().Find(row, c.Path);
             RowCursor emailScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, root, c.TypeArgs, out emailScope));
             for (String email : g.Emails) {
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref emailScope, email));
                 assert !emailScope.MoveNext(row);
             }
 
-            RefObject<RowCursor> tempRef_emailScope =
-                new RefObject<RowCursor>(emailScope);
+            Reference<RowCursor> tempReference_emailScope =
+                new Reference<RowCursor>(emailScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_emailScope);
-            emailScope = tempRef_emailScope.get();
+                tempReference_emailScope);
+            emailScope = tempReference_emailScope.get();
         }
 
         if (g.PhoneNumbers != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.guestLayout.TryFind("phone_numbers", out c);
             root.get().Find(row, c.Path);
             RowCursor phoneNumbersScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, root, c.TypeArgs,
                 out phoneNumbersScope));
             for (String phone : g.PhoneNumbers) {
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref phoneNumbersScope
                     , phone));
                 assert !phoneNumbersScope.MoveNext(row);
             }
 
-            RefObject<RowCursor> tempRef_phoneNumbersScope =
-                new RefObject<RowCursor>(phoneNumbersScope);
+            Reference<RowCursor> tempReference_phoneNumbersScope =
+                new Reference<RowCursor>(phoneNumbersScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_phoneNumbersScope);
-            phoneNumbersScope = tempRef_phoneNumbersScope.get();
+                tempReference_phoneNumbersScope);
+            phoneNumbersScope = tempReference_phoneNumbersScope.get();
         }
 
         if (g.Addresses != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.guestLayout.TryFind("addresses", out c);
             root.get().Find(row, c.Path);
             RowCursor addressesScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, root, c.TypeArgs, out addressesScope));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             TypeArgument tupleType = c.<LayoutUniqueScope>TypeAs().FieldType(ref addressesScope);
             TypeArgument t0 = tupleType.getTypeArgs().get(0).clone();
@@ -784,102 +786,102 @@ public final class CustomerExampleUnitTests {
             for (Map.Entry<String, Address> pair : g.Addresses.entrySet()) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().WriteScope(row, ref tempCursor,
                     c.TypeArgs, out tupleScope));
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(t0.<LayoutUtf8>TypeAs().WriteSparse(row, ref tupleScope, pair.getKey()));
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor addressScope;
-                OutObject<RowCursor> tempOut_addressScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(t1.<LayoutUDT>TypeAs().WriteScope(row, tempRef_tupleScope,
+                Out<RowCursor> tempOut_addressScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(t1.<LayoutUDT>TypeAs().WriteScope(row, tempReference_tupleScope,
                     t1.getTypeArgs().clone(), tempOut_addressScope));
                 addressScope = tempOut_addressScope.get();
-                tupleScope = tempRef_tupleScope.get();
-                RefObject<RowCursor> tempRef_addressScope =
-                    new RefObject<RowCursor>(addressScope);
-                this.WriteAddress(row, tempRef_addressScope, t1.getTypeArgs().clone(), pair.getValue());
-                addressScope = tempRef_addressScope.get();
+                tupleScope = tempReference_tupleScope.get();
+                Reference<RowCursor> tempReference_addressScope =
+                    new Reference<RowCursor>(addressScope);
+                this.WriteAddress(row, tempReference_addressScope, t1.getTypeArgs().clone(), pair.getValue());
+                addressScope = tempReference_addressScope.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !tupleScope.MoveNext(row, ref addressScope);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, ref addressesScope,
                     ref tempCursor));
             }
 
-            RefObject<RowCursor> tempRef_addressesScope =
-                new RefObject<RowCursor>(addressesScope);
+            Reference<RowCursor> tempReference_addressesScope =
+                new Reference<RowCursor>(addressesScope);
             RowCursorExtensions.Skip(root.get().clone(), row,
-                tempRef_addressesScope);
-            addressesScope = tempRef_addressesScope.get();
+                tempReference_addressesScope);
+            addressesScope = tempReference_addressesScope.get();
         }
     }
 
-    private void WriteHotel(RefObject<RowBuffer> row, RefObject<RowCursor> root, Hotel h) {
+    private void WriteHotel(Reference<RowBuffer> row, Reference<RowCursor> root, Hotel h) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("hotel_id", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, h.Id));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("name", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, h.Name));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("phone", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, h.Phone));
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.hotelLayout.TryFind("address", out c);
         root.get().Find(row, c.Path);
         RowCursor addressScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutUDT>TypeAs().WriteScope(row, root, c.TypeArgs, out addressScope));
-        RefObject<RowCursor> tempRef_addressScope =
-            new RefObject<RowCursor>(addressScope);
-        this.WriteAddress(row, tempRef_addressScope, c.TypeArgs, h.Address);
-        addressScope = tempRef_addressScope.get();
-        RefObject<RowCursor> tempRef_addressScope2 =
-            new RefObject<RowCursor>(addressScope);
+        Reference<RowCursor> tempReference_addressScope =
+            new Reference<RowCursor>(addressScope);
+        this.WriteAddress(row, tempReference_addressScope, c.TypeArgs, h.Address);
+        addressScope = tempReference_addressScope.get();
+        Reference<RowCursor> tempReference_addressScope2 =
+            new Reference<RowCursor>(addressScope);
         RowCursorExtensions.Skip(root.get().clone(), row,
-            tempRef_addressScope2);
-        addressScope = tempRef_addressScope2.get();
+            tempReference_addressScope2);
+        addressScope = tempReference_addressScope2.get();
     }
 
-    private void WritePostalCode(RefObject<RowBuffer> row, RefObject<RowCursor> postalCodeScope,
+    private void WritePostalCode(Reference<RowBuffer> row, Reference<RowCursor> postalCodeScope,
                                  TypeArgumentList typeArgs, PostalCode pc) {
         Layout postalCodeLayout = this.customerResolver.Resolve(typeArgs.getSchemaId().clone());
         assert postalCodeLayout != null;
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert postalCodeLayout.TryFind("zip", out c);
         ResultAssert.IsSuccess(c.<LayoutInt32>TypeAs().WriteFixed(row, postalCodeScope, c, pc.Zip));
         if (pc.Plus4.HasValue) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert postalCodeLayout.TryFind("plus4", out c);
             postalCodeScope.get().Find(row, c.Path);
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/DeleteRowDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/DeleteRowDispatcher.java
index d078154..df71922 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/DeleteRowDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/DeleteRowDispatcher.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutIndexedScope;
@@ -20,149 +21,149 @@ import java.util.List;
 //ORIGINAL LINE: internal struct DeleteRowDispatcher : IDispatcher
 public final class DeleteRowDispatcher implements IDispatcher {
 
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t) {
         Dispatch(dispatcher, root, col, t, null);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public void Dispatch<TLayout, TValue>(ref RowOperationDispatcher dispatcher, ref RowCursor root,
     // LayoutColumn col, LayoutType t, TValue value = default) where TLayout : LayoutType<TValue>
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t, TValue value) {
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<TLayout>TypeAs().DeleteSparse(tempRef_Row, root));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t, TValue value) {
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<TLayout>TypeAs().DeleteSparse(tempReference_Row, root));
+        dispatcher.get().argValue.Row = tempReference_Row.get();
     }
 
-    public void DispatchArray(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchArray(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor arrayScope;
-        OutObject<RowCursor> tempOut_arrayScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().ReadScope(tempRef_Row, scope, tempOut_arrayScope));
+        Out<RowCursor> tempOut_arrayScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().ReadScope(tempReference_Row, scope, tempOut_arrayScope));
         arrayScope = tempOut_arrayScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         if (!arrayScope.Immutable) {
             List items = (List)value;
             for (Object item : items) {
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                assert arrayScope.MoveNext(tempRef_Row2);
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                assert arrayScope.MoveNext(tempReference_Row2);
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 dispatcher.get().LayoutCodeSwitch(ref arrayScope, null, typeArgs.get(0).getType(),
                     typeArgs.get(0).getTypeArgs().clone(), item);
             }
         }
 
-        RefObject<RowBuffer> tempRef_Row3 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().DeleteScope(tempRef_Row3, scope));
-        dispatcher.get().argValue.Row = tempRef_Row3.get();
+        Reference<RowBuffer> tempReference_Row3 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().DeleteScope(tempReference_Row3, scope));
+        dispatcher.get().argValue.Row = tempReference_Row3.get();
     }
 
-    public void DispatchMap(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchMap(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 2);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor mapScope;
-        OutObject<RowCursor> tempOut_mapScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().ReadScope(tempRef_Row, scope, tempOut_mapScope));
+        Out<RowCursor> tempOut_mapScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().ReadScope(tempReference_Row, scope, tempOut_mapScope));
         mapScope = tempOut_mapScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         if (!mapScope.Immutable) {
             List items = (List)value;
             for (Object item : items) {
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                assert mapScope.MoveNext(tempRef_Row2);
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                assert mapScope.MoveNext(tempReference_Row2);
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 dispatcher.get().LayoutCodeSwitch(ref mapScope, null, LayoutType.TypedTuple, typeArgs.clone(), item);
             }
         }
 
-        RefObject<RowBuffer> tempRef_Row3 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().DeleteScope(tempRef_Row3, scope));
-        dispatcher.get().argValue.Row = tempRef_Row3.get();
+        Reference<RowBuffer> tempReference_Row3 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().DeleteScope(tempReference_Row3, scope));
+        dispatcher.get().argValue.Row = tempReference_Row3.get();
     }
 
-    public void DispatchNullable(RefObject<RowOperationDispatcher> dispatcher,
-                                 RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchNullable(Reference<RowOperationDispatcher> dispatcher,
+                                 Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                                  Object value) {
         checkArgument(typeArgs.getCount() == 1);
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().DeleteScope(tempRef_Row, scope));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().DeleteScope(tempReference_Row, scope));
+        dispatcher.get().argValue.Row = tempReference_Row.get();
     }
 
-    public void DispatchObject(RefObject<RowOperationDispatcher> dispatcher,
-                               RefObject<RowCursor> scope) {
+    public void DispatchObject(Reference<RowOperationDispatcher> dispatcher,
+                               Reference<RowCursor> scope) {
     }
 
-    public void DispatchSet(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchSet(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor setScope;
-        OutObject<RowCursor> tempOut_setScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().ReadScope(tempRef_Row, scope, tempOut_setScope));
+        Out<RowCursor> tempOut_setScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().ReadScope(tempReference_Row, scope, tempOut_setScope));
         setScope = tempOut_setScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         if (!setScope.Immutable) {
             List items = (List)value;
             for (Object item : items) {
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                assert setScope.MoveNext(tempRef_Row2);
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                assert setScope.MoveNext(tempReference_Row2);
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 dispatcher.get().LayoutCodeSwitch(ref setScope, null, typeArgs.get(0).getType(),
                     typeArgs.get(0).getTypeArgs().clone(), item);
             }
         }
 
-        RefObject<RowBuffer> tempRef_Row3 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().DeleteScope(tempRef_Row3, scope));
-        dispatcher.get().argValue.Row = tempRef_Row3.get();
+        Reference<RowBuffer> tempReference_Row3 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().DeleteScope(tempReference_Row3, scope));
+        dispatcher.get().argValue.Row = tempReference_Row3.get();
     }
 
-    public void DispatchTuple(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchTuple(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() >= 2);
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().DeleteScope(tempRef_Row, scope));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().DeleteScope(tempReference_Row, scope));
+        dispatcher.get().argValue.Row = tempReference_Row.get();
     }
 
-    public void DispatchUDT(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
-        RefObject<RowBuffer> tempRef_Row = new RefObject<RowBuffer>(dispatcher.get().Row);
-        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().DeleteScope(tempRef_Row, scope));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+    public void DispatchUDT(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
+        Reference<RowBuffer> tempReference_Row = new Reference<RowBuffer>(dispatcher.get().Row);
+        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().DeleteScope(tempReference_Row, scope));
+        dispatcher.get().argValue.Row = tempReference_Row.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatchable.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatchable.java
index a493f8a..de71fca 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatchable.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatchable.java
@@ -4,9 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 public interface IDispatchable {
-    void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope);
+    void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope);
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatcher.java
index 1dc81cc..6e222a8 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/IDispatcher.java
@@ -4,39 +4,40 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
 public interface IDispatcher {
 
-    <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher,
-                                                               RefObject<RowCursor> scope, LayoutColumn col,
+    <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher,
+                                                               Reference<RowCursor> scope, LayoutColumn col,
                                                                LayoutType t);
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: void Dispatch<TLayout, TValue>(ref RowOperationDispatcher dispatcher, ref RowCursor scope,
     // LayoutColumn col, LayoutType t, TValue value = default) where TLayout : LayoutType<TValue>;
-    <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher,
-                                                               RefObject<RowCursor> scope, LayoutColumn col,
+    <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher,
+                                                               Reference<RowCursor> scope, LayoutColumn col,
                                                                LayoutType t, TValue value);
 
-    void DispatchArray(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchArray(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                        LayoutType t, TypeArgumentList typeArgs, Object value);
 
-    void DispatchMap(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchMap(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                      LayoutType t, TypeArgumentList typeArgs, Object value);
 
-    void DispatchNullable(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchNullable(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                           LayoutType t, TypeArgumentList typeArgs, Object value);
 
-    void DispatchObject(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope);
+    void DispatchObject(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope);
 
-    void DispatchSet(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchSet(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                      LayoutType t, TypeArgumentList typeArgs, Object value);
 
-    void DispatchTuple(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchTuple(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                        LayoutType t, TypeArgumentList typeArgs, Object value);
 
-    void DispatchUDT(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope,
+    void DispatchUDT(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope,
                      LayoutType type, TypeArgumentList typeArgs, Object value);
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/LayoutCompilerUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/LayoutCompilerUnitTests.java
index dad6e31..9aa064d 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/LayoutCompilerUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/LayoutCompilerUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -187,7 +188,7 @@ public class LayoutCompilerUnitTests {
     Assert.IsTrue(layout.toString().length()>0,"Json: {0}",expected.Json);
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Fixed,col.Storage,"Json: {0}",expected.Json);
@@ -295,7 +296,7 @@ public final void ParseSchemaVariable()
     Layout layout=resolver.Resolve(new SchemaId(-1));
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     assert col.Type.AllowVariable;
@@ -496,7 +497,7 @@ public final void ParseSchemaSparseSimple()
     Assert.AreEqual(1,layout.getColumns().Length,"Json: {0}",expected.Json);
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,col.Storage,"Json: {0}",expected.Json);
@@ -561,7 +562,7 @@ public final void ParseSchemaUDT()
     Layout layout=s.Compile(n1);
     LayoutColumn udtACol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("u",out udtACol);
     Assert.IsTrue(found,tag);
     Assert.AreEqual(StorageKind.Sparse,udtACol.Storage,tag);
@@ -573,7 +574,7 @@ public final void ParseSchemaUDT()
     // Verify that UDT versioning works through schema references.
     LayoutColumn udtBCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=layout.TryFind("v",out udtBCol);
     Assert.IsTrue(found,tag);
     Assert.AreEqual(StorageKind.Sparse,udtBCol.Storage,tag);
@@ -596,7 +597,7 @@ public final void ParseSchemaUDT()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row2=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     RowCursor scope;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row,out scope).Find(tempRef_row2,udtACol.Path);
     row=tempRef_row2.argValue;
     row=tempRef_row.argValue;
@@ -645,7 +646,7 @@ public final void ParseSchemaUDT()
     {
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=udtLayout.TryFind(expected.Path,out col);
     Assert.IsTrue(found,"Path: {0}",expected.Path);
     StorageKind storage=expected.Storage;
@@ -683,20 +684,20 @@ public final void ParseSchemaUDT()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row9=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     RowCursor roRoot;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row8).AsReadOnly(out roRoot).Find(tempRef_row9,udtACol.Path);
     row=tempRef_row9.argValue;
     row=tempRef_row8.argValue;
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row10=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot
-    // be converted using the 'RefObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Ref' helper class unless the method is within the code being modified:
     ResultAssert.InsufficientPermissions(udtACol.<LayoutUDT>TypeAs().DeleteScope(tempRef_row10,ref roRoot));
     row=tempRef_row10.argValue;
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row11=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot
-    // be converted using the 'RefObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Ref' helper class unless the method is within the code being modified:
     ResultAssert.InsufficientPermissions(udtACol.<LayoutUDT>TypeAs().WriteScope(tempRef_row11,ref roRoot,
     udtACol.TypeArgs,out udtScope2));
     row=tempRef_row11.argValue;
@@ -705,7 +706,7 @@ public final void ParseSchemaUDT()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row12=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row13=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row12,out scope).Find(tempRef_row13,udtACol.Path);
     row=tempRef_row13.argValue;
     row=tempRef_row12.argValue;
@@ -735,7 +736,7 @@ public final void ParseSchemaUDT()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row17=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row18=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row17,out scope).Find(tempRef_row18,udtACol.Path);
     row=tempRef_row18.argValue;
     row=tempRef_row17.argValue;
@@ -757,7 +758,7 @@ public final void ParseSchemaUDT()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row21=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row22=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row21,out scope).Find(tempRef_row22,udtACol.Path);
     row=tempRef_row22.argValue;
     row=tempRef_row21.argValue;
@@ -798,13 +799,13 @@ public final void ParseSchemaSparseObject()
     Assert.AreEqual(1,layout.getColumns().Length,"Json: {0}",expected.Json);
     LayoutColumn objCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out objCol);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,objCol.Storage,"Json: {0}",expected.Json);
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=layout.TryFind("a.b",out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,col.Storage,"Json: {0}",expected.Json);
@@ -898,7 +899,7 @@ public final void ParseSchemaSparseObjectMulti()
     Assert.AreEqual(1,layout.getColumns().Length,"Json: {0}",expected.Json);
     LayoutColumn objCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out objCol);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,objCol.Storage,"Json: {0}",expected.Json);
@@ -918,7 +919,7 @@ public final void ParseSchemaSparseObjectMulti()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row2=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     RowCursor field;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     RowCursor.Create(tempRef_row,out field).Find(tempRef_row2,objCol.Path);
     row=tempRef_row2.argValue;
     row=tempRef_row.argValue;
@@ -948,7 +949,7 @@ public final void ParseSchemaSparseObjectMulti()
     {
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=layout.TryFind(prop.Path,out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,col.Storage,"Json: {0}",expected.Json);
@@ -971,7 +972,7 @@ public final void ParseSchemaSparseObjectMulti()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row6=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     RowCursor otherColumn;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     field.Clone(out otherColumn).Find(tempRef_row6,otherColumnPath);
     row=tempRef_row6.argValue;
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row7=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
@@ -1002,7 +1003,7 @@ public final void ParseSchemaSparseObjectMulti()
     // Read the thing after the scope and verify it is still there.
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row10=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     field.Clone(out otherColumn).Find(tempRef_row10,otherColumnPath);
     row=tempRef_row10.argValue;
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row11=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
@@ -1085,13 +1086,13 @@ public final void ParseSchemaSparseObjectNested()
     Layout layout=resolver.Resolve(new SchemaId(-1));
     LayoutColumn objCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out objCol);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,objCol.Storage,"Json: {0}",expected.Json);
     LayoutColumn objCol2;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=layout.TryFind("a.b",out objCol2);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,objCol2.Storage,"Json: {0}",expected.Json);
@@ -1113,7 +1114,7 @@ public final void ParseSchemaSparseObjectNested()
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row2=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
     RowCursor field;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     root.Clone(out field).Find(tempRef_row2,objCol.Path);
     row=tempRef_row2.argValue;
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>tempRef_row3=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowBuffer>(row);
@@ -1132,7 +1133,7 @@ public final void ParseSchemaSparseObjectNested()
     {
     LayoutColumn col;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     found=layout.TryFind(prop.Path,out col);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,col.Storage,"Json: {0}",expected.Json);
@@ -1280,7 +1281,7 @@ public final void ParseSchemaSparseArray()
     Layout layout=resolver.Resolve(new SchemaId(-1));
     LayoutColumn arrCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out arrCol);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,arrCol.Storage,"Json: {0}",expected.Json);
@@ -1427,7 +1428,7 @@ public final void ParseSchemaSparseSet()
     Layout layout=resolver.Resolve(new SchemaId(-1));
     LayoutColumn setCol;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     boolean found=layout.TryFind("a",out setCol);
     Assert.IsTrue(found,"Json: {0}",expected.Json);
     Assert.AreEqual(StorageKind.Sparse,setCol.Storage,"Json: {0}",expected.Json);
@@ -1480,7 +1481,7 @@ private static RowCursor EnsureScope(tangible.RefObject<RowBuffer> row,tangible.
     assert pT!=null;
     RowCursor field;
     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot
-    // be converted using the 'OutObject' helper class unless the method is within the code being modified:
+    // be converted using the 'Out' helper class unless the method is within the code being modified:
     parentScope.Clone(out field).Find(row,col.getPath());
     tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowCursor>tempRef_field=new tangible.RefObject<azure.data.cosmos.serialization.hybridrow.RowCursor>(field);
     RowCursor scope;
@@ -1599,7 +1600,7 @@ default:
 
 private final static class RoundTripFixed extends TestActionDispatcher<RoundTripFixed.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn col = closure.Col;
         Expected expected = closure.Expected.clone();
@@ -1610,12 +1611,12 @@ private final static class RoundTripFixed extends TestActionDispatcher<RoundTrip
         TLayout t = (TLayout)col.getType();
         if (LayoutBit.opNotEquals(col.getNullBit().clone(),
             LayoutBit.Invalid)) {
-            OutObject<TValue> tempOut_value = new OutObject<TValue>();
+            Out<TValue> tempOut_value = new Out<TValue>();
             r = t.ReadFixed(row, root, col, tempOut_value);
             value = tempOut_value.get();
             ResultAssert.NotFound(r, "Json: {0}", expected.Json);
         } else {
-            OutObject<TValue> tempOut_value2 = new OutObject<TValue>();
+            Out<TValue> tempOut_value2 = new Out<TValue>();
             r = t.ReadFixed(row, root, col, tempOut_value2);
             value = tempOut_value2.get();
             ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
@@ -1630,7 +1631,7 @@ private final static class RoundTripFixed extends TestActionDispatcher<RoundTrip
 
         r = t.WriteFixed(row, root, col, (TValue)expected.Value);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        OutObject<TValue> tempOut_value3 = new OutObject<TValue>();
+        Out<TValue> tempOut_value3 = new Out<TValue>();
         r = t.ReadFixed(row, root, col, tempOut_value3);
         value = tempOut_value3.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
@@ -1644,13 +1645,13 @@ private final static class RoundTripFixed extends TestActionDispatcher<RoundTrip
 
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(t.WriteFixed(row, ref roRoot, col, (TValue)expected.Value));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(t.DeleteFixed(row, ref roRoot, col));
 
         if (LayoutBit.opNotEquals(col.getNullBit().clone(),
@@ -1704,7 +1705,7 @@ private final static class RoundTripFixed extends TestActionDispatcher<RoundTrip
 
 private final static class RoundTripSparseArray extends TestActionDispatcher<RoundTripSparseArray.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn arrCol = closure.ArrCol;
         LayoutType tempVar = arrCol.getType();
@@ -1720,23 +1721,23 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
         // Verify the array doesn't yet exist.
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out field).Find(row, arrCol.getPath());
-        RefObject<RowCursor> tempRef_field =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field =
+            new Reference<RowCursor>(field);
         RowCursor scope;
-        OutObject<RowCursor> tempOut_scope =
-            new OutObject<RowCursor>();
-        Result r = arrT.ReadScope(row, tempRef_field, tempOut_scope);
+        Out<RowCursor> tempOut_scope =
+            new Out<RowCursor>();
+        Result r = arrT.ReadScope(row, tempReference_field, tempOut_scope);
         scope = tempOut_scope.get();
-        field = tempRef_field.get();
+        field = tempReference_field.get();
         ResultAssert.NotFound(r, tag);
 
         // Write the array.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = arrT.WriteScope(row, ref field, arrCol.getTypeArgs().clone(), out scope);
         ResultAssert.IsSuccess(r, tag);
 
@@ -1744,21 +1745,21 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
         assert !scope.MoveNext(row);
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref scope, out value);
         ResultAssert.NotFound(r, tag);
 
         // Write the nested fields.
         RowCursor elm;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.Clone(out elm);
         for (Object item : expected.Value) {
             // Write the ith index.
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.WriteSparse(row, ref elm, (TValue)item);
             ResultAssert.IsSuccess(r, tag);
@@ -1768,14 +1769,14 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
         }
 
         // Read the array and the nested column, validate the nested column has the proper value.
-        RefObject<RowCursor> tempRef_field2 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field2 =
+            new Reference<RowCursor>(field);
         RowCursor scope2;
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        r = arrT.ReadScope(row, tempRef_field2, tempOut_scope2);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        r = arrT.ReadScope(row, tempReference_field2, tempOut_scope2);
         scope2 = tempOut_scope2.get();
-        field = tempRef_field2.get();
+        field = tempReference_field2.get();
         ResultAssert.IsSuccess(r, tag);
         Assert.AreEqual(scope.ScopeType, scope2.ScopeType, tag);
         Assert.AreEqual(scope.start, scope2.start, tag);
@@ -1783,15 +1784,15 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
 
         // Read the nested fields
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope2.Clone(out elm);
         for (Object item : expected.Value) {
             assert elm.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref elm, out value);
             ResultAssert.IsSuccess(r, tag);
@@ -1807,24 +1808,24 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
         // Delete an item.
         int indexToDelete = 1;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert scope2.Clone(out elm).MoveTo(row, indexToDelete);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.DeleteSparse(row, ref elm);
         ResultAssert.IsSuccess(r, tag);
         ArrayList<Object> remainingValues = new ArrayList<Object>(expected.Value);
         remainingValues.remove(indexToDelete);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope2.Clone(out elm);
         for (Object item : remainingValues) {
             assert elm.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref elm, out value);
             ResultAssert.IsSuccess(r, tag);
@@ -1838,66 +1839,66 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert !scope2.Clone(out elm).MoveTo(row, remainingValues.size());
 
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot).Find(row, arrCol.getPath());
-        RefObject<RowCursor> tempRef_roRoot =
-            new RefObject<RowCursor>(roRoot);
-        ResultAssert.InsufficientPermissions(arrT.DeleteScope(row, tempRef_roRoot));
-        roRoot = tempRef_roRoot.get();
+        Reference<RowCursor> tempReference_roRoot =
+            new Reference<RowCursor>(roRoot);
+        ResultAssert.InsufficientPermissions(arrT.DeleteScope(row, tempReference_roRoot));
+        roRoot = tempReference_roRoot.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(arrT.WriteScope(row, ref roRoot, arrCol.getTypeArgs().clone(),
             out scope2));
 
         // Overwrite the whole scope.
-        RefObject<RowCursor> tempRef_field3 =
-            new RefObject<RowCursor>(field);
-        r = LayoutType.Null.WriteSparse(row, tempRef_field3, NullValue.Default);
-        field = tempRef_field3.get();
+        Reference<RowCursor> tempReference_field3 =
+            new Reference<RowCursor>(field);
+        r = LayoutType.Null.WriteSparse(row, tempReference_field3, NullValue.Default);
+        field = tempReference_field3.get();
         ResultAssert.IsSuccess(r, tag);
-        RefObject<RowCursor> tempRef_field4 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field4 =
+            new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__ =
-            new OutObject<RowCursor>();
-        r = arrT.ReadScope(row, tempRef_field4, tempOut__);
+        Out<RowCursor> tempOut__ =
+            new Out<RowCursor>();
+        r = arrT.ReadScope(row, tempReference_field4, tempOut__);
         _ = tempOut__.get();
-        field = tempRef_field4.get();
+        field = tempReference_field4.get();
         ResultAssert.TypeMismatch(r, tag);
-        RefObject<RowCursor> tempRef_field5 =
-            new RefObject<RowCursor>(field);
-        r = arrT.DeleteScope(row, tempRef_field5);
-        field = tempRef_field5.get();
+        Reference<RowCursor> tempReference_field5 =
+            new Reference<RowCursor>(field);
+        r = arrT.DeleteScope(row, tempReference_field5);
+        field = tempReference_field5.get();
         ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
 
         // Overwrite it again, then delete it.
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = arrT.WriteScope(row, ref field, arrCol.getTypeArgs().clone(), out _, UpdateOptions.Update);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field6 =
-            new RefObject<RowCursor>(field);
-        r = arrT.DeleteScope(row, tempRef_field6);
-        field = tempRef_field6.get();
+        Reference<RowCursor> tempReference_field6 =
+            new Reference<RowCursor>(field);
+        r = arrT.DeleteScope(row, tempReference_field6);
+        field = tempReference_field6.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field7 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field7 =
+            new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__2 =
-            new OutObject<RowCursor>();
-        r = arrT.ReadScope(row, tempRef_field7, tempOut__2);
+        Out<RowCursor> tempOut__2 =
+            new Out<RowCursor>();
+        r = arrT.ReadScope(row, tempReference_field7, tempOut__2);
         _ = tempOut__2.get();
-        field = tempRef_field7.get();
+        field = tempReference_field7.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
     }
 
@@ -1940,7 +1941,7 @@ private final static class RoundTripSparseArray extends TestActionDispatcher<Rou
 
 private final static class RoundTripSparseObject extends TestActionDispatcher<RoundTripSparseObject.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn objCol = closure.ObjCol;
         LayoutType tempVar = objCol.getType();
@@ -1957,56 +1958,56 @@ private final static class RoundTripSparseObject extends TestActionDispatcher<Ro
         // Attempt to read the object and the nested column.
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out field).Find(row, objCol.getPath());
-        RefObject<RowCursor> tempRef_field =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field =
+            new Reference<RowCursor>(field);
         RowCursor scope;
-        OutObject<RowCursor> tempOut_scope =
-            new OutObject<RowCursor>();
-        Result r = objT.ReadScope(row, tempRef_field, tempOut_scope);
+        Out<RowCursor> tempOut_scope =
+            new Out<RowCursor>();
+        Result r = objT.ReadScope(row, tempReference_field, tempOut_scope);
         scope = tempOut_scope.get();
-        field = tempRef_field.get();
+        field = tempReference_field.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
 
         // Write the object and the nested column.
-        RefObject<RowCursor> tempRef_field2 =
-            new RefObject<RowCursor>(field);
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        r = objT.WriteScope(row, tempRef_field2, objCol.getTypeArgs().clone(), tempOut_scope2);
+        Reference<RowCursor> tempReference_field2 =
+            new Reference<RowCursor>(field);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        r = objT.WriteScope(row, tempReference_field2, objCol.getTypeArgs().clone(), tempOut_scope2);
         scope = tempOut_scope2.get();
-        field = tempRef_field2.get();
+        field = tempReference_field2.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
 
         // Verify the nested field doesn't yet appear within the new scope.
         RowCursor nestedField;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.Clone(out nestedField).Find(row, col.getPath());
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref nestedField, out value);
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
 
         // Write the nested field.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref nestedField, (TValue)expected.Value);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
 
         // Read the object and the nested column, validate the nested column has the proper value.
-        RefObject<RowCursor> tempRef_field3 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field3 =
+            new Reference<RowCursor>(field);
         RowCursor scope2;
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        r = objT.ReadScope(row, tempRef_field3, tempOut_scope2);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        r = objT.ReadScope(row, tempReference_field3, tempOut_scope2);
         scope2 = tempOut_scope2.get();
-        field = tempRef_field3.get();
+        field = tempReference_field3.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         Assert.AreEqual(scope.ScopeType, scope2.ScopeType, "Json: {0}", expected.Json);
         Assert.AreEqual(scope.start, scope2.start, "Json: {0}", expected.Json);
@@ -2014,12 +2015,12 @@ private final static class RoundTripSparseObject extends TestActionDispatcher<Ro
 
         // Read the nested field
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope2.Clone(out nestedField).Find(row, col.getPath());
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref nestedField, out value);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         boolean tempVar2 = expected.Value instanceof Array;
@@ -2032,65 +2033,65 @@ private final static class RoundTripSparseObject extends TestActionDispatcher<Ro
 
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot).Find(row, objCol.getPath());
-        RefObject<RowCursor> tempRef_roRoot =
-            new RefObject<RowCursor>(roRoot);
-        ResultAssert.InsufficientPermissions(objT.DeleteScope(row, tempRef_roRoot));
-        roRoot = tempRef_roRoot.get();
-        RefObject<RowCursor> tempRef_roRoot2 =
-            new RefObject<RowCursor>(roRoot);
-        OutObject<RowCursor> tempOut_scope22 =
-            new OutObject<RowCursor>();
-        ResultAssert.InsufficientPermissions(objT.WriteScope(row, tempRef_roRoot2, objCol.getTypeArgs().clone(),
+        Reference<RowCursor> tempReference_roRoot =
+            new Reference<RowCursor>(roRoot);
+        ResultAssert.InsufficientPermissions(objT.DeleteScope(row, tempReference_roRoot));
+        roRoot = tempReference_roRoot.get();
+        Reference<RowCursor> tempReference_roRoot2 =
+            new Reference<RowCursor>(roRoot);
+        Out<RowCursor> tempOut_scope22 =
+            new Out<RowCursor>();
+        ResultAssert.InsufficientPermissions(objT.WriteScope(row, tempReference_roRoot2, objCol.getTypeArgs().clone(),
             tempOut_scope22));
         scope2 = tempOut_scope22.get();
-        roRoot = tempRef_roRoot2.get();
+        roRoot = tempReference_roRoot2.get();
 
         // Overwrite the whole scope.
-        RefObject<RowCursor> tempRef_field4 =
-            new RefObject<RowCursor>(field);
-        r = LayoutType.Null.WriteSparse(row, tempRef_field4, NullValue.Default);
-        field = tempRef_field4.get();
+        Reference<RowCursor> tempReference_field4 =
+            new Reference<RowCursor>(field);
+        r = LayoutType.Null.WriteSparse(row, tempReference_field4, NullValue.Default);
+        field = tempReference_field4.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field5 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field5 =
+            new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__ =
-            new OutObject<RowCursor>();
-        r = objT.ReadScope(row, tempRef_field5, tempOut__);
+        Out<RowCursor> tempOut__ =
+            new Out<RowCursor>();
+        r = objT.ReadScope(row, tempReference_field5, tempOut__);
         _ = tempOut__.get();
-        field = tempRef_field5.get();
+        field = tempReference_field5.get();
         ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field6 =
-            new RefObject<RowCursor>(field);
-        r = objT.DeleteScope(row, tempRef_field6);
-        field = tempRef_field6.get();
+        Reference<RowCursor> tempReference_field6 =
+            new Reference<RowCursor>(field);
+        r = objT.DeleteScope(row, tempReference_field6);
+        field = tempReference_field6.get();
         ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
 
         // Overwrite it again, then delete it.
-        RefObject<RowCursor> tempRef_field7 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field7 =
+            new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__2 =
-            new OutObject<RowCursor>();
-        r = objT.WriteScope(row, tempRef_field7, objCol.getTypeArgs().clone(), tempOut__2, UpdateOptions.Update);
+        Out<RowCursor> tempOut__2 =
+            new Out<RowCursor>();
+        r = objT.WriteScope(row, tempReference_field7, objCol.getTypeArgs().clone(), tempOut__2, UpdateOptions.Update);
         _ = tempOut__2.get();
-        field = tempRef_field7.get();
+        field = tempReference_field7.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field8 =
-            new RefObject<RowCursor>(field);
-        r = objT.DeleteScope(row, tempRef_field8);
-        field = tempRef_field8.get();
+        Reference<RowCursor> tempReference_field8 =
+            new Reference<RowCursor>(field);
+        r = objT.DeleteScope(row, tempReference_field8);
+        field = tempReference_field8.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field9 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field9 =
+            new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__3 =
-            new OutObject<RowCursor>();
-        r = objT.ReadScope(row, tempRef_field9, tempOut__3);
+        Out<RowCursor> tempOut__3 =
+            new Out<RowCursor>();
+        r = objT.ReadScope(row, tempReference_field9, tempOut__3);
         _ = tempOut__3.get();
-        field = tempRef_field9.get();
+        field = tempReference_field9.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
     }
 
@@ -2133,7 +2134,7 @@ private final static class RoundTripSparseObject extends TestActionDispatcher<Ro
 
 private final static class RoundTripSparseObjectMulti extends TestActionDispatcher<RoundTripSparseObjectMulti.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> scope,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> scope,
                                            Closure closure) {
         LayoutColumn col = closure.Col;
         Property prop = closure.Prop.clone();
@@ -2147,27 +2148,27 @@ private final static class RoundTripSparseObjectMulti extends TestActionDispatch
         // Verify the nested field doesn't yet appear within the new scope.
         RowCursor nestedField;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.get().Clone(out nestedField).Find(row, col.getPath());
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         Result r = t.ReadSparse(row, ref nestedField, out value);
         Assert.IsTrue(r == Result.NotFound || r == Result.TypeMismatch, tag);
 
         // Write the nested field.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref nestedField, (TValue)prop.Value);
         ResultAssert.IsSuccess(r, tag);
 
         // Read the nested field
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref nestedField, out value);
         ResultAssert.IsSuccess(r, tag);
         boolean tempVar = prop.Value instanceof Array;
@@ -2180,30 +2181,30 @@ private final static class RoundTripSparseObjectMulti extends TestActionDispatch
 
         // Overwrite the nested field.
         if (t instanceof LayoutNull) {
-            RefObject<RowCursor> tempRef_nestedField =
-                new RefObject<RowCursor>(nestedField);
-            r = LayoutType.Boolean.WriteSparse(row, tempRef_nestedField, false);
-            nestedField = tempRef_nestedField.get();
+            Reference<RowCursor> tempReference_nestedField =
+                new Reference<RowCursor>(nestedField);
+            r = LayoutType.Boolean.WriteSparse(row, tempReference_nestedField, false);
+            nestedField = tempReference_nestedField.get();
             ResultAssert.IsSuccess(r, tag);
         } else {
-            RefObject<RowCursor> tempRef_nestedField2 =
-                new RefObject<RowCursor>(nestedField);
-            r = LayoutType.Null.WriteSparse(row, tempRef_nestedField2, NullValue.Default);
-            nestedField = tempRef_nestedField2.get();
+            Reference<RowCursor> tempReference_nestedField2 =
+                new Reference<RowCursor>(nestedField);
+            r = LayoutType.Null.WriteSparse(row, tempReference_nestedField2, NullValue.Default);
+            nestedField = tempReference_nestedField2.get();
             ResultAssert.IsSuccess(r, tag);
         }
 
         // Verify nested field no longer there.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref nestedField, out value);
         ResultAssert.TypeMismatch(r, tag);
     }
 
     @Override
-    public void DispatchObject(RefObject<RowBuffer> row, RefObject<RowCursor> scope,
+    public void DispatchObject(Reference<RowBuffer> row, Reference<RowCursor> scope,
                                Closure closure) {
         LayoutColumn col = closure.Col;
         Property prop = closure.Prop.clone();
@@ -2217,62 +2218,62 @@ private final static class RoundTripSparseObjectMulti extends TestActionDispatch
         // Verify the nested field doesn't yet appear within the new scope.
         RowCursor nestedField;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.get().Clone(out nestedField).Find(row, col.getPath());
-        RefObject<RowCursor> tempRef_nestedField =
-            new RefObject<RowCursor>(nestedField);
+        Reference<RowCursor> tempReference_nestedField =
+            new Reference<RowCursor>(nestedField);
         RowCursor scope2;
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        Result r = t.ReadScope(row, tempRef_nestedField, tempOut_scope2);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        Result r = t.ReadScope(row, tempReference_nestedField, tempOut_scope2);
         scope2 = tempOut_scope2.get();
-        nestedField = tempRef_nestedField.get();
+        nestedField = tempReference_nestedField.get();
         ResultAssert.NotFound(r, tag);
 
         // Write the nested field.
-        RefObject<RowCursor> tempRef_nestedField2 =
-            new RefObject<RowCursor>(nestedField);
-        OutObject<RowCursor> tempOut_scope22 =
-            new OutObject<RowCursor>();
-        r = t.WriteScope(row, tempRef_nestedField2, col.getTypeArgs().clone(), tempOut_scope22);
+        Reference<RowCursor> tempReference_nestedField2 =
+            new Reference<RowCursor>(nestedField);
+        Out<RowCursor> tempOut_scope22 =
+            new Out<RowCursor>();
+        r = t.WriteScope(row, tempReference_nestedField2, col.getTypeArgs().clone(), tempOut_scope22);
         scope2 = tempOut_scope22.get();
-        nestedField = tempRef_nestedField2.get();
+        nestedField = tempReference_nestedField2.get();
         ResultAssert.IsSuccess(r, tag);
 
         // Read the nested field
-        RefObject<RowCursor> tempRef_nestedField3 =
-            new RefObject<RowCursor>(nestedField);
+        Reference<RowCursor> tempReference_nestedField3 =
+            new Reference<RowCursor>(nestedField);
         RowCursor scope3;
-        OutObject<RowCursor> tempOut_scope3 =
-            new OutObject<RowCursor>();
-        r = t.ReadScope(row, tempRef_nestedField3, tempOut_scope3);
+        Out<RowCursor> tempOut_scope3 =
+            new Out<RowCursor>();
+        r = t.ReadScope(row, tempReference_nestedField3, tempOut_scope3);
         scope3 = tempOut_scope3.get();
-        nestedField = tempRef_nestedField3.get();
+        nestedField = tempReference_nestedField3.get();
         ResultAssert.IsSuccess(r, tag);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Assert.AreEqual(scope2.AsReadOnly(out _).ScopeType, scope3.ScopeType, tag);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Assert.AreEqual(scope2.AsReadOnly(out _).start, scope3.start, tag);
 
         // Overwrite the nested field.
-        RefObject<RowCursor> tempRef_nestedField4 =
-            new RefObject<RowCursor>(nestedField);
-        r = LayoutType.Null.WriteSparse(row, tempRef_nestedField4, NullValue.Default);
-        nestedField = tempRef_nestedField4.get();
+        Reference<RowCursor> tempReference_nestedField4 =
+            new Reference<RowCursor>(nestedField);
+        r = LayoutType.Null.WriteSparse(row, tempReference_nestedField4, NullValue.Default);
+        nestedField = tempReference_nestedField4.get();
         ResultAssert.IsSuccess(r, tag);
 
         // Verify nested field no longer there.
-        RefObject<RowCursor> tempRef_nestedField5 =
-            new RefObject<RowCursor>(nestedField);
-        OutObject<RowCursor> tempOut_scope32 =
-            new OutObject<RowCursor>();
-        r = t.ReadScope(row, tempRef_nestedField5, tempOut_scope32);
+        Reference<RowCursor> tempReference_nestedField5 =
+            new Reference<RowCursor>(nestedField);
+        Out<RowCursor> tempOut_scope32 =
+            new Out<RowCursor>();
+        r = t.ReadScope(row, tempReference_nestedField5, tempOut_scope32);
         scope3 = tempOut_scope32.get();
-        nestedField = tempRef_nestedField5.get();
+        nestedField = tempReference_nestedField5.get();
         ResultAssert.TypeMismatch(r, tag);
     }
 
@@ -2332,7 +2333,7 @@ private final static class RoundTripSparseObjectMulti extends TestActionDispatch
 
 private final static class RoundTripSparseObjectNested extends TestActionDispatcher<RoundTripSparseObjectNested.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn col = closure.Col;
         Property prop = closure.Prop.clone();
@@ -2349,19 +2350,19 @@ private final static class RoundTripSparseObjectNested extends TestActionDispatc
         // Write the nested field.
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         scope.Clone(out field).Find(row, col.getPath());
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         Result r = t.WriteSparse(row, ref field, (TValue)prop.Value);
         ResultAssert.IsSuccess(r, tag);
 
         // Read the nested field
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref field, out value);
         ResultAssert.IsSuccess(r, tag);
         boolean tempVar = prop.Value instanceof Array;
@@ -2374,30 +2375,30 @@ private final static class RoundTripSparseObjectNested extends TestActionDispatc
 
         // Overwrite the nested field.
         if (t instanceof LayoutNull) {
-            RefObject<RowCursor> tempRef_field =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Boolean.WriteSparse(row, tempRef_field, false);
-            field = tempRef_field.get();
+            Reference<RowCursor> tempReference_field =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Boolean.WriteSparse(row, tempReference_field, false);
+            field = tempReference_field.get();
             ResultAssert.IsSuccess(r, tag);
         } else {
-            RefObject<RowCursor> tempRef_field2 =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Null.WriteSparse(row, tempRef_field2, NullValue.Default);
-            field = tempRef_field2.get();
+            Reference<RowCursor> tempReference_field2 =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Null.WriteSparse(row, tempReference_field2, NullValue.Default);
+            field = tempReference_field2.get();
             ResultAssert.IsSuccess(r, tag);
         }
 
         // Verify nested field no longer there.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref field, out value);
         ResultAssert.TypeMismatch(r, tag);
     }
 
     @Override
-    public void DispatchObject(RefObject<RowBuffer> row, RefObject<RowCursor> root, Closure closure) {
+    public void DispatchObject(Reference<RowBuffer> row, Reference<RowCursor> root, Closure closure) {
         LayoutColumn col = closure.Col;
         Property prop = closure.Prop.clone();
         Expected expected = closure.Expected.clone();
@@ -2466,7 +2467,7 @@ private final static class RoundTripSparseObjectNested extends TestActionDispatc
 
 private final static class RoundTripSparseOrdering extends TestActionDispatcher<RoundTripSparseOrdering.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutType type = closure.Expected.Type;
         String path = closure.Expected.Path;
@@ -2477,17 +2478,17 @@ private final static class RoundTripSparseOrdering extends TestActionDispatcher<
         TValue value = (TValue)exValue;
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out field).Find(row, path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         Result r = t.WriteSparse(row, ref field, value);
         ResultAssert.IsSuccess(r, "Json: {0}", json);
-        OutObject<TValue> tempOut_value = new OutObject<TValue>();
+        Out<TValue> tempOut_value = new Out<TValue>();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref field, tempOut_value);
         value = tempOut_value.get();
         ResultAssert.IsSuccess(r, "Json: {0}", json);
@@ -2500,33 +2501,33 @@ private final static class RoundTripSparseOrdering extends TestActionDispatcher<
         }
 
         if (t instanceof LayoutNull) {
-            RefObject<RowCursor> tempRef_field =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Boolean.WriteSparse(row, tempRef_field, false);
-            field = tempRef_field.get();
+            Reference<RowCursor> tempReference_field =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Boolean.WriteSparse(row, tempReference_field, false);
+            field = tempReference_field.get();
             ResultAssert.IsSuccess(r, "Json: {0}", json);
-            OutObject<TValue> tempOut_value2 = new OutObject<TValue>();
+            Out<TValue> tempOut_value2 = new Out<TValue>();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref field, tempOut_value2);
             value = tempOut_value2.get();
             ResultAssert.TypeMismatch(r, "Json: {0}", json);
         } else {
-            RefObject<RowCursor> tempRef_field2 =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Null.WriteSparse(row, tempRef_field2, NullValue.Default);
-            field = tempRef_field2.get();
+            Reference<RowCursor> tempReference_field2 =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Null.WriteSparse(row, tempReference_field2, NullValue.Default);
+            field = tempReference_field2.get();
             ResultAssert.IsSuccess(r, "Json: {0}", json);
-            OutObject<TValue> tempOut_value3 = new OutObject<TValue>();
+            Out<TValue> tempOut_value3 = new Out<TValue>();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref field, tempOut_value3);
             value = tempOut_value3.get();
@@ -2573,7 +2574,7 @@ private final static class RoundTripSparseOrdering extends TestActionDispatcher<
 
 private final static class RoundTripSparseSet extends TestActionDispatcher<RoundTripSparseSet.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn setCol = closure.SetCol;
         LayoutType tempVar = setCol.getType();
@@ -2589,23 +2590,23 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
         // Verify the Set doesn't yet exist.
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out field).Find(row, setCol.getPath());
-        RefObject<RowCursor> tempRef_field =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field =
+            new Reference<RowCursor>(field);
         RowCursor scope;
-        OutObject<RowCursor> tempOut_scope =
-            new OutObject<RowCursor>();
-        Result r = setT.ReadScope(row, tempRef_field, tempOut_scope);
+        Out<RowCursor> tempOut_scope =
+            new Out<RowCursor>();
+        Result r = setT.ReadScope(row, tempReference_field, tempOut_scope);
         scope = tempOut_scope.get();
-        field = tempRef_field.get();
+        field = tempReference_field.get();
         ResultAssert.NotFound(r, tag);
 
         // Write the Set.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = setT.WriteScope(row, ref field, setCol.getTypeArgs().clone(), out scope);
         ResultAssert.IsSuccess(r, tag);
 
@@ -2613,9 +2614,9 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
         assert !scope.MoveNext(row);
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref scope, out value);
         ResultAssert.NotFound(r, tag);
 
@@ -2624,23 +2625,23 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
             // Write the ith item into staging storage.
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.WriteSparse(row, ref tempCursor, (TValue)v1);
             ResultAssert.IsSuccess(r, tag);
 
             // Move item into the set.
-            RefObject<RowCursor> tempRef_scope =
-                new RefObject<RowCursor>(scope);
-            RefObject<RowCursor> tempRef_tempCursor =
-                new RefObject<RowCursor>(tempCursor);
-            r = setT.MoveField(row, tempRef_scope, tempRef_tempCursor);
-            tempCursor = tempRef_tempCursor.get();
-            scope = tempRef_scope.get();
+            Reference<RowCursor> tempReference_scope =
+                new Reference<RowCursor>(scope);
+            Reference<RowCursor> tempReference_tempCursor =
+                new Reference<RowCursor>(tempCursor);
+            r = setT.MoveField(row, tempReference_scope, tempReference_tempCursor);
+            tempCursor = tempReference_tempCursor.get();
+            scope = tempReference_scope.get();
             ResultAssert.IsSuccess(r, tag);
         }
 
@@ -2649,55 +2650,55 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
             // Write the ith item into staging storage.
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.WriteSparse(row, ref tempCursor, (TValue)v2);
             ResultAssert.IsSuccess(r, tag);
 
             // Move item into the set.
-            RefObject<RowCursor> tempRef_scope2 =
-                new RefObject<RowCursor>(scope);
-            RefObject<RowCursor> tempRef_tempCursor2 =
-                new RefObject<RowCursor>(tempCursor);
-            r = setT.MoveField(row, tempRef_scope2, tempRef_tempCursor2, UpdateOptions.Insert);
-            tempCursor = tempRef_tempCursor2.get();
-            scope = tempRef_scope2.get();
+            Reference<RowCursor> tempReference_scope2 =
+                new Reference<RowCursor>(scope);
+            Reference<RowCursor> tempReference_tempCursor2 =
+                new Reference<RowCursor>(tempCursor);
+            r = setT.MoveField(row, tempReference_scope2, tempReference_tempCursor2, UpdateOptions.Insert);
+            tempCursor = tempReference_tempCursor2.get();
+            scope = tempReference_scope2.get();
             ResultAssert.Exists(r, tag);
         }
 
         // Read the Set and the nested column, validate the nested column has the proper value.
-        RefObject<RowCursor> tempRef_field2 =
-            new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field2 =
+            new Reference<RowCursor>(field);
         RowCursor scope2;
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        r = setT.ReadScope(row, tempRef_field2, tempOut_scope2);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        r = setT.ReadScope(row, tempReference_field2, tempOut_scope2);
         scope2 = tempOut_scope2.get();
-        field = tempRef_field2.get();
+        field = tempReference_field2.get();
         ResultAssert.IsSuccess(r, tag);
         Assert.AreEqual(scope.ScopeType, scope2.ScopeType, tag);
         Assert.AreEqual(scope.start, scope2.start, tag);
         Assert.AreEqual(scope.Immutable, scope2.Immutable, tag);
 
         // Read the nested fields
-        RefObject<RowCursor> tempRef_field3 =
-            new RefObject<RowCursor>(field);
-        OutObject<RowCursor> tempOut_scope2 =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field3, tempOut_scope2));
+        Reference<RowCursor> tempReference_field3 =
+            new Reference<RowCursor>(field);
+        Out<RowCursor> tempOut_scope2 =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field3, tempOut_scope2));
         scope = tempOut_scope2.get();
-        field = tempRef_field3.get();
+        field = tempReference_field3.get();
         for (Object item : expected.Value) {
             assert scope.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref scope, out value);
             ResultAssert.IsSuccess(r, tag);
@@ -2711,68 +2712,68 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
         }
 
         // Delete all of the items and then insert them again in the opposite order.
-        RefObject<RowCursor> tempRef_field4 =
-            new RefObject<RowCursor>(field);
-        OutObject<RowCursor> tempOut_scope3 =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field4, tempOut_scope3));
+        Reference<RowCursor> tempReference_field4 =
+            new Reference<RowCursor>(field);
+        Out<RowCursor> tempOut_scope3 =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field4, tempOut_scope3));
         scope = tempOut_scope3.get();
-        field = tempRef_field4.get();
+        field = tempReference_field4.get();
         for (int i = 0; i < expected.Value.size(); i++) {
             assert scope.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.DeleteSparse(row, ref scope);
             ResultAssert.IsSuccess(r, tag);
         }
 
-        RefObject<RowCursor> tempRef_field5 =
-            new RefObject<RowCursor>(field);
-        OutObject<RowCursor> tempOut_scope4 =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field5, tempOut_scope4));
+        Reference<RowCursor> tempReference_field5 =
+            new Reference<RowCursor>(field);
+        Out<RowCursor> tempOut_scope4 =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field5, tempOut_scope4));
         scope = tempOut_scope4.get();
-        field = tempRef_field5.get();
+        field = tempReference_field5.get();
         for (int i = expected.Value.size() - 1; i >= 0; i--) {
             // Write the ith item into staging storage.
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.WriteSparse(row, ref tempCursor, (TValue)expected.Value.get(i));
             ResultAssert.IsSuccess(r, tag);
 
             // Move item into the set.
-            RefObject<RowCursor> tempRef_scope3 =
-                new RefObject<RowCursor>(scope);
-            RefObject<RowCursor> tempRef_tempCursor3 =
-                new RefObject<RowCursor>(tempCursor);
-            r = setT.MoveField(row, tempRef_scope3, tempRef_tempCursor3);
-            tempCursor = tempRef_tempCursor3.get();
-            scope = tempRef_scope3.get();
+            Reference<RowCursor> tempReference_scope3 =
+                new Reference<RowCursor>(scope);
+            Reference<RowCursor> tempReference_tempCursor3 =
+                new Reference<RowCursor>(tempCursor);
+            r = setT.MoveField(row, tempReference_scope3, tempReference_tempCursor3);
+            tempCursor = tempReference_tempCursor3.get();
+            scope = tempReference_scope3.get();
             ResultAssert.IsSuccess(r, tag);
         }
 
         // Verify they still enumerate in sorted order.
-        RefObject<RowCursor> tempRef_field6 =
-            new RefObject<RowCursor>(field);
-        OutObject<RowCursor> tempOut_scope5 =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field6, tempOut_scope5));
+        Reference<RowCursor> tempReference_field6 =
+            new Reference<RowCursor>(field);
+        Out<RowCursor> tempOut_scope5 =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field6, tempOut_scope5));
         scope = tempOut_scope5.get();
-        field = tempRef_field6.get();
+        field = tempReference_field6.get();
         for (Object item : expected.Value) {
             assert scope.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref scope, out value);
             ResultAssert.IsSuccess(r, tag);
@@ -2788,28 +2789,28 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
         // Delete one item.
         if (expected.Value.size() > 1) {
             int indexToDelete = 1;
-            RefObject<RowCursor> tempRef_field7 =
-                new RefObject<RowCursor>(field);
-            OutObject<RowCursor> tempOut_scope6 = new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field7, tempOut_scope6));
+            Reference<RowCursor> tempReference_field7 =
+                new Reference<RowCursor>(field);
+            Out<RowCursor> tempOut_scope6 = new Out<RowCursor>();
+            ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field7, tempOut_scope6));
             scope = tempOut_scope6.get();
-            field = tempRef_field7.get();
+            field = tempReference_field7.get();
             assert scope.MoveTo(row, indexToDelete);
-            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+            // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
             r = t.DeleteSparse(row, ref scope);
             ResultAssert.IsSuccess(r, tag);
             ArrayList<Object> remainingValues = new ArrayList<Object>(expected.Value);
             remainingValues.remove(indexToDelete);
 
-            RefObject<RowCursor> tempRef_field8 = new RefObject<RowCursor>(field);
-            OutObject<RowCursor> tempOut_scope7 = new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(setT.ReadScope(row, tempRef_field8, tempOut_scope7));
+            Reference<RowCursor> tempReference_field8 = new Reference<RowCursor>(field);
+            Out<RowCursor> tempOut_scope7 = new Out<RowCursor>();
+            ResultAssert.IsSuccess(setT.ReadScope(row, tempReference_field8, tempOut_scope7));
             scope = tempOut_scope7.get();
-            field = tempRef_field8.get();
+            field = tempReference_field8.get();
             for (Object item : remainingValues) {
                 assert scope.MoveNext(row);
-                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+                // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
                 r = t.ReadSparse(row, ref scope, out value);
                 ResultAssert.IsSuccess(r, tag);
                 boolean tempVar4 = item instanceof Array;
@@ -2825,49 +2826,49 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
         }
 
         RowCursor roRoot;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot).Find(row, setCol.getPath());
-        RefObject<RowCursor> tempRef_roRoot = new RefObject<RowCursor>(roRoot);
-        ResultAssert.InsufficientPermissions(setT.DeleteScope(row, tempRef_roRoot));
-        roRoot = tempRef_roRoot.get();
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        Reference<RowCursor> tempReference_roRoot = new Reference<RowCursor>(roRoot);
+        ResultAssert.InsufficientPermissions(setT.DeleteScope(row, tempReference_roRoot));
+        roRoot = tempReference_roRoot.get();
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(setT.WriteScope(row, ref roRoot, setCol.getTypeArgs().clone(), out _));
 
         // Overwrite the whole scope.
-        RefObject<RowCursor> tempRef_field9 = new RefObject<RowCursor>(field);
-        r = LayoutType.Null.WriteSparse(row, tempRef_field9, NullValue.Default);
-        field = tempRef_field9.get();
+        Reference<RowCursor> tempReference_field9 = new Reference<RowCursor>(field);
+        r = LayoutType.Null.WriteSparse(row, tempReference_field9, NullValue.Default);
+        field = tempReference_field9.get();
         ResultAssert.IsSuccess(r, tag);
-        RefObject<RowCursor> tempRef_field10 = new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field10 = new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__ = new OutObject<RowCursor>();
-        r = setT.ReadScope(row, tempRef_field10, tempOut__);
+        Out<RowCursor> tempOut__ = new Out<RowCursor>();
+        r = setT.ReadScope(row, tempReference_field10, tempOut__);
         _ = tempOut__.get();
-        field = tempRef_field10.get();
+        field = tempReference_field10.get();
         ResultAssert.TypeMismatch(r, tag);
-        RefObject<RowCursor> tempRef_field11 = new RefObject<RowCursor>(field);
-        r = setT.DeleteScope(row, tempRef_field11);
-        field = tempRef_field11.get();
+        Reference<RowCursor> tempReference_field11 = new Reference<RowCursor>(field);
+        r = setT.DeleteScope(row, tempReference_field11);
+        field = tempReference_field11.get();
         ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
 
         // Overwrite it again, then delete it.
-        RefObject<RowCursor> tempRef_field12 = new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field12 = new Reference<RowCursor>(field);
         RowCursor _;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        r = setT.WriteScope(row, tempRef_field12, setCol.getTypeArgs().clone(), out _, UpdateOptions.Update);
-        field = tempRef_field12.get();
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        r = setT.WriteScope(row, tempReference_field12, setCol.getTypeArgs().clone(), out _, UpdateOptions.Update);
+        field = tempReference_field12.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field13 = new RefObject<RowCursor>(field);
-        r = setT.DeleteScope(row, tempRef_field13);
-        field = tempRef_field13.get();
+        Reference<RowCursor> tempReference_field13 = new Reference<RowCursor>(field);
+        r = setT.DeleteScope(row, tempReference_field13);
+        field = tempReference_field13.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
-        RefObject<RowCursor> tempRef_field14 = new RefObject<RowCursor>(field);
+        Reference<RowCursor> tempReference_field14 = new Reference<RowCursor>(field);
         RowCursor _;
-        OutObject<RowCursor> tempOut__2 = new OutObject<RowCursor>();
-        r = setT.ReadScope(row, tempRef_field14, tempOut__2);
+        Out<RowCursor> tempOut__2 = new Out<RowCursor>();
+        r = setT.ReadScope(row, tempReference_field14, tempOut__2);
         _ = tempOut__2.get();
-        field = tempRef_field14.get();
+        field = tempReference_field14.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
     }
 
@@ -2910,7 +2911,7 @@ private final static class RoundTripSparseSet extends TestActionDispatcher<Round
 
 private final static class RoundTripSparseSimple extends TestActionDispatcher<RoundTripSparseSimple.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn col = closure.Col;
         Expected expected = closure.Expected.clone();
@@ -2919,31 +2920,31 @@ private final static class RoundTripSparseSimple extends TestActionDispatcher<Ro
         TLayout t = (TLayout)col.getType();
         RowCursor field;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out field).Find(row, col.getPath());
         TValue value;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         Result r = t.ReadSparse(row, ref field, out value);
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref field, (TValue)expected.Value, UpdateOptions.Update);
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref field, (TValue)expected.Value);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref field, (TValue)expected.Value, UpdateOptions.Insert);
         ResultAssert.Exists(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref field, out value);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         boolean tempVar = expected.Value instanceof Array;
@@ -2956,64 +2957,64 @@ private final static class RoundTripSparseSimple extends TestActionDispatcher<Ro
 
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot).Find(row, col.getPath());
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(t.DeleteSparse(row, ref roRoot));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.InsufficientPermissions(t.WriteSparse(row, ref roRoot, (TValue)expected.Value,
             UpdateOptions.Update));
 
         if (t instanceof LayoutNull) {
-            RefObject<RowCursor> tempRef_field =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Boolean.WriteSparse(row, tempRef_field, false);
-            field = tempRef_field.get();
+            Reference<RowCursor> tempReference_field =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Boolean.WriteSparse(row, tempReference_field, false);
+            field = tempReference_field.get();
             ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref field, out value);
             ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
         } else {
-            RefObject<RowCursor> tempRef_field2 =
-                new RefObject<RowCursor>(field);
-            r = LayoutType.Null.WriteSparse(row, tempRef_field2, NullValue.Default);
-            field = tempRef_field2.get();
+            Reference<RowCursor> tempReference_field2 =
+                new Reference<RowCursor>(field);
+            r = LayoutType.Null.WriteSparse(row, tempReference_field2, NullValue.Default);
+            field = tempReference_field2.get();
             ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             r = t.ReadSparse(row, ref field, out value);
             ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.DeleteSparse(row, ref field);
         ResultAssert.TypeMismatch(r, "Json: {0}", expected.Json);
 
         // Overwrite it again, then delete it.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.WriteSparse(row, ref field, (TValue)expected.Value, UpdateOptions.Update);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.DeleteSparse(row, ref field);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         r = t.ReadSparse(row, ref field, out value);
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
     }
@@ -3055,7 +3056,7 @@ private final static class RoundTripSparseSimple extends TestActionDispatcher<Ro
 
 private static class RoundTripVariable extends TestActionDispatcher<RoundTripVariable.Closure> {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         LayoutColumn col = closure.Col;
         Expected expected = closure.Expected.clone();
@@ -3065,11 +3066,11 @@ private static class RoundTripVariable extends TestActionDispatcher<RoundTripVar
         this.<TLayout, TValue>RoundTrip(row, root, col, expected.Value, expected.clone());
     }
 
-    protected final <TLayout extends LayoutType<TValue>, TValue> void Compare(RefObject<RowBuffer> row,
-                                                                              RefObject<RowCursor> root, LayoutColumn col, Object exValue, Expected expected) {
+    protected final <TLayout extends LayoutType<TValue>, TValue> void Compare(Reference<RowBuffer> row,
+                                                                              Reference<RowCursor> root, LayoutColumn col, Object exValue, Expected expected) {
         TLayout t = (TLayout)col.getType();
         TValue value;
-        OutObject<TValue> tempOut_value = new OutObject<TValue>();
+        Out<TValue> tempOut_value = new Out<TValue>();
         Result r = t.ReadVariable(row, root, col, tempOut_value);
         value = tempOut_value.get();
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
@@ -3082,8 +3083,8 @@ private static class RoundTripVariable extends TestActionDispatcher<RoundTripVar
         }
     }
 
-    protected final <TLayout extends LayoutType<TValue>, TValue> void RoundTrip(RefObject<RowBuffer> row,
-                                                                                RefObject<RowCursor> root, LayoutColumn col, Object exValue, Expected expected) {
+    protected final <TLayout extends LayoutType<TValue>, TValue> void RoundTrip(Reference<RowBuffer> row,
+                                                                                Reference<RowCursor> root, LayoutColumn col, Object exValue, Expected expected) {
         TLayout t = (TLayout)col.getType();
         Result r = t.WriteVariable(row, root, col, (TValue)exValue);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
@@ -3091,12 +3092,12 @@ private static class RoundTripVariable extends TestActionDispatcher<RoundTripVar
 
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot);
-        RefObject<RowCursor> tempRef_roRoot =
-            new RefObject<RowCursor>(roRoot);
-        ResultAssert.InsufficientPermissions(t.WriteVariable(row, tempRef_roRoot, col, (TValue)expected.Value));
-        roRoot = tempRef_roRoot.get();
+        Reference<RowCursor> tempReference_roRoot =
+            new Reference<RowCursor>(roRoot);
+        ResultAssert.InsufficientPermissions(t.WriteVariable(row, tempReference_roRoot, col, (TValue)expected.Value));
+        roRoot = tempReference_roRoot.get();
     }
 
     //C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class may
@@ -3143,16 +3144,16 @@ private static class RoundTripVariable extends TestActionDispatcher<RoundTripVar
 }
 
 private abstract static class TestActionDispatcher<TClosure> {
-    public abstract <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> scope, TClosure closure);
+    public abstract <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> scope, TClosure closure);
 
-    public void DispatchObject(RefObject<RowBuffer> row, RefObject<RowCursor> scope, TClosure closure) {
+    public void DispatchObject(Reference<RowBuffer> row, Reference<RowCursor> scope, TClosure closure) {
         Assert.Fail("not implemented");
     }
 }
 
 private final static class VariableInterleaving extends RoundTripVariable {
     @Override
-    public <TLayout, TValue> void Dispatch(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    public <TLayout, TValue> void Dispatch(Reference<RowBuffer> row, Reference<RowCursor> root,
                                            Closure closure) {
         Layout layout = closure.Layout;
         Expected expected = closure.Expected.clone();
@@ -3192,44 +3193,44 @@ private final static class VariableInterleaving extends RoundTripVariable {
         this.<TLayout, TValue>Delete(row, root, a, expected.clone());
     }
 
-    private <TLayout extends LayoutType<TValue>, TValue> void Delete(RefObject<RowBuffer> row,
-                                                                     RefObject<RowCursor> root, LayoutColumn col, Expected expected) {
+    private <TLayout extends LayoutType<TValue>, TValue> void Delete(Reference<RowBuffer> row,
+                                                                     Reference<RowCursor> root, LayoutColumn col, Expected expected) {
         TLayout t = (TLayout)col.getType();
         RowCursor roRoot;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().AsReadOnly(out roRoot);
-        RefObject<RowCursor> tempRef_roRoot =
-            new RefObject<RowCursor>(roRoot);
-        ResultAssert.InsufficientPermissions(t.DeleteVariable(row, tempRef_roRoot, col));
-        roRoot = tempRef_roRoot.get();
+        Reference<RowCursor> tempReference_roRoot =
+            new Reference<RowCursor>(roRoot);
+        ResultAssert.InsufficientPermissions(t.DeleteVariable(row, tempReference_roRoot, col));
+        roRoot = tempReference_roRoot.get();
         Result r = t.DeleteVariable(row, root, col);
         ResultAssert.IsSuccess(r, "Json: {0}", expected.Json);
         TValue _;
-        OutObject<TValue> tempOut__ = new OutObject<TValue>();
+        Out<TValue> tempOut__ = new Out<TValue>();
         r = t.ReadVariable(row, root, col, tempOut__);
         _ = tempOut__.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
     }
 
-    private <TLayout extends LayoutType<TValue>, TValue> void TooBig(RefObject<RowBuffer> row,
-                                                                     RefObject<RowCursor> root, LayoutColumn col, Expected expected) {
+    private <TLayout extends LayoutType<TValue>, TValue> void TooBig(Reference<RowBuffer> row,
+                                                                     Reference<RowCursor> root, LayoutColumn col, Expected expected) {
         TLayout t = (TLayout)col.getType();
         Result r = t.WriteVariable(row, root, col, (TValue)expected.TooBig);
         Assert.AreEqual(Result.TooBig, r, "Json: {0}", expected.Json);
     }
 
-    private <TLayout extends LayoutType<TValue>, TValue> LayoutColumn Verify(RefObject<RowBuffer> row,
-                                                                             RefObject<RowCursor> root, Layout layout, String path, Expected expected) {
+    private <TLayout extends LayoutType<TValue>, TValue> LayoutColumn Verify(Reference<RowBuffer> row,
+                                                                             Reference<RowCursor> root, Layout layout, String path, Expected expected) {
         LayoutColumn col;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         boolean found = layout.TryFind(path, out col);
         Assert.IsTrue(found, "Json: {0}", expected.Json);
         assert col.Type.AllowVariable;
         TLayout t = (TLayout)col.Type;
         TValue _;
-        OutObject<TValue> tempOut__ = new OutObject<TValue>();
+        Out<TValue> tempOut__ = new Out<TValue>();
         Result r = t.ReadVariable(row, root, col, tempOut__);
         _ = tempOut__.get();
         ResultAssert.NotFound(r, "Json: {0}", expected.Json);
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullRowDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullRowDispatcher.java
index b7e1a29..ef91ba6 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullRowDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullRowDispatcher.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 
@@ -13,75 +14,75 @@ import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 //ORIGINAL LINE: internal struct NullRowDispatcher : IDispatcher
 public final class NullRowDispatcher implements IDispatcher {
 
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t) {
         Dispatch(dispatcher, root, col, t, null);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public void Dispatch<TLayout, TValue>(ref RowOperationDispatcher dispatcher, ref RowCursor root,
     // LayoutColumn col, LayoutType t, TValue expected = default) where TLayout : LayoutType<TValue>
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t, TValue expected) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t, TValue expected) {
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_Row =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
+                Reference<RowBuffer> tempReference_Row =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
                 TValue _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadFixed(tempRef_Row, root, col, out _));
-                dispatcher.get().argValue.Row = tempRef_Row.get();
+                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadFixed(tempReference_Row, root, col, out _));
+                dispatcher.get().argValue.Row = tempReference_Row.get();
                 break;
             case Variable:
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
                 TValue _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadVariable(tempRef_Row2, root, col, out _));
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadVariable(tempReference_Row2, root, col, out _));
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 break;
             default:
-                RefObject<RowBuffer> tempRef_Row3 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
+                Reference<RowBuffer> tempReference_Row3 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
                 TValue _;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadSparse(tempRef_Row3, root, out _));
-                dispatcher.get().argValue.Row = tempRef_Row3.get();
+                ResultAssert.NotFound(t.<TLayout>TypeAs().ReadSparse(tempReference_Row3, root, out _));
+                dispatcher.get().argValue.Row = tempReference_Row3.get();
                 break;
         }
     }
 
-    public void DispatchArray(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchArray(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
     }
 
-    public void DispatchMap(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
+    public void DispatchMap(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
     }
 
-    public void DispatchNullable(RefObject<RowOperationDispatcher> dispatcher,
-                                 RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchNullable(Reference<RowOperationDispatcher> dispatcher,
+                                 Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                                  Object value) {
     }
 
-    public void DispatchObject(RefObject<RowOperationDispatcher> dispatcher,
-                               RefObject<RowCursor> scope) {
+    public void DispatchObject(Reference<RowOperationDispatcher> dispatcher,
+                               Reference<RowCursor> scope) {
     }
 
-    public void DispatchSet(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchSet(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
     }
 
-    public void DispatchTuple(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchTuple(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
     }
 
-    public void DispatchUDT(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
+    public void DispatchUDT(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs, Object value) {
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullableUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullableUnitTests.java
index 80298df..bb073fb 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullableUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/NullableUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -53,26 +54,26 @@ public final class NullableUnitTests {
             "-000000000000}"), 1), Map.entry(UUID.fromString("{4674962B-CE11-4916-81C5-0421EE36F168}"), 20),
             Map.entry(UUID.fromString("{7499C40E-7077-45C1-AE5F-3E384966B3B9}"), null)));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteNullables(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteNullables(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Nullables t2 = this.ReadNullables(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Nullables t2 = this.ReadNullables(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert t1 == t2;
     }
 
@@ -89,12 +90,12 @@ public final class NullableUnitTests {
     // TODO: C# TO JAVA CONVERTER: The C# 'struct' constraint has no equivalent in Java:
     //ORIGINAL LINE: private static Result ReadNullable<TValue>(ref RowBuffer row, ref RowCursor scope, TypeArgument
     // itemType, out Nullable<TValue> item, out RowCursor nullableScope) where TValue : struct
-    private static <TValue> Result ReadNullable(RefObject<RowBuffer> row,
-                                                RefObject<RowCursor> scope, TypeArgument itemType,
-                                                OutObject<TValue> item,
-                                                OutObject<RowCursor> nullableScope) {
+    private static <TValue> Result ReadNullable(Reference<RowBuffer> row,
+                                                Reference<RowCursor> scope, TypeArgument itemType,
+                                                Out<TValue> item,
+                                                Out<RowCursor> nullableScope) {
         TValue value;
-        OutObject<TValue> tempOut_value = new OutObject<TValue>();
+        Out<TValue> tempOut_value = new Out<TValue>();
         Result r = NullableUnitTests.ReadNullableImpl(row, scope, itemType.clone(), tempOut_value,
             nullableScope.clone());
         value = tempOut_value.get();
@@ -107,18 +108,18 @@ public final class NullableUnitTests {
         return Result.Success;
     }
 
-    private static <TValue> Result ReadNullable(RefObject<RowBuffer> row,
-                                                RefObject<RowCursor> scope, TypeArgument itemType,
-                                                OutObject<TValue> item,
-                                                OutObject<RowCursor> nullableScope) {
+    private static <TValue> Result ReadNullable(Reference<RowBuffer> row,
+                                                Reference<RowCursor> scope, TypeArgument itemType,
+                                                Out<TValue> item,
+                                                Out<RowCursor> nullableScope) {
         Result r = NullableUnitTests.ReadNullableImpl(row, scope, itemType.clone(), item, nullableScope.clone());
         return (r == Result.NotFound) ? Result.Success : r;
     }
 
-    private static <TValue> Result ReadNullableImpl(RefObject<RowBuffer> row,
-                                                    RefObject<RowCursor> scope, TypeArgument itemType,
-                                                    OutObject<TValue> item,
-                                                    OutObject<RowCursor> nullableScope) {
+    private static <TValue> Result ReadNullableImpl(Reference<RowBuffer> row,
+                                                    Reference<RowCursor> scope, TypeArgument itemType,
+                                                    Out<TValue> item,
+                                                    Out<RowCursor> nullableScope) {
         Result r = itemType.getType().<LayoutNullable>TypeAs().ReadScope(row, scope, nullableScope.clone());
         if (r != Result.Success) {
             item.set(null);
@@ -136,248 +137,248 @@ public final class NullableUnitTests {
         return Result.NotFound;
     }
 
-    private Nullables ReadNullables(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Nullables ReadNullables(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Nullables value = new Nullables();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nullbool", out c);
         RowCursor scope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref scope, out scope) == Result.Success) {
             value.NullBool = new ArrayList<Boolean>();
             RowCursor nullableScope = null;
-            RefObject<RowCursor> tempRef_nullableScope =
-                new RefObject<RowCursor>(nullableScope);
-            while (scope.MoveNext(row, tempRef_nullableScope)) {
-                nullableScope = tempRef_nullableScope.get();
-                RefObject<RowCursor> tempRef_scope =
-                    new RefObject<RowCursor>(scope);
+            Reference<RowCursor> tempReference_nullableScope =
+                new Reference<RowCursor>(nullableScope);
+            while (scope.MoveNext(row, tempReference_nullableScope)) {
+                nullableScope = tempReference_nullableScope.get();
+                Reference<RowCursor> tempReference_scope =
+                    new Reference<RowCursor>(scope);
                 Nullable<Boolean> item;
-                OutObject<TValue> tempOut_item = new OutObject<TValue>();
-                OutObject<RowCursor> tempOut_nullableScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_scope, c.TypeArgs[0], tempOut_item
+                Out<TValue> tempOut_item = new Out<TValue>();
+                Out<RowCursor> tempOut_nullableScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_scope, c.TypeArgs[0], tempOut_item
                     , tempOut_nullableScope));
                 nullableScope = tempOut_nullableScope.get();
                 item = tempOut_item.get();
-                scope = tempRef_scope.get();
+                scope = tempReference_scope.get();
                 value.NullBool.add(item);
             }
-            nullableScope = tempRef_nullableScope.get();
+            nullableScope = tempReference_nullableScope.get();
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nullarray", out c);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref scope, out scope) == Result.Success) {
             value.NullArray = new ArrayList<Float>();
             RowCursor nullableScope = null;
-            RefObject<RowCursor> tempRef_nullableScope2 =
-                new RefObject<RowCursor>(nullableScope);
-            while (scope.MoveNext(row, tempRef_nullableScope2)) {
-                nullableScope = tempRef_nullableScope2.get();
-                RefObject<RowCursor> tempRef_scope2 =
-                    new RefObject<RowCursor>(scope);
+            Reference<RowCursor> tempReference_nullableScope2 =
+                new Reference<RowCursor>(nullableScope);
+            while (scope.MoveNext(row, tempReference_nullableScope2)) {
+                nullableScope = tempReference_nullableScope2.get();
+                Reference<RowCursor> tempReference_scope2 =
+                    new Reference<RowCursor>(scope);
                 Nullable<Float> item;
-                OutObject<TValue> tempOut_item2 = new OutObject<TValue>();
-                OutObject<RowCursor> tempOut_nullableScope2 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_scope2, c.TypeArgs[0],
+                Out<TValue> tempOut_item2 = new Out<TValue>();
+                Out<RowCursor> tempOut_nullableScope2 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_scope2, c.TypeArgs[0],
                     tempOut_item2, tempOut_nullableScope2));
                 nullableScope = tempOut_nullableScope2.get();
                 item = tempOut_item2.get();
-                scope = tempRef_scope2.get();
+                scope = tempReference_scope2.get();
                 value.NullArray.add(item);
             }
-            nullableScope = tempRef_nullableScope2.get();
+            nullableScope = tempReference_nullableScope2.get();
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nullset", out c);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedSet>TypeAs().ReadScope(row, ref scope, out scope) == Result.Success) {
             value.NullSet = new ArrayList<String>();
             RowCursor nullableScope = null;
-            RefObject<RowCursor> tempRef_nullableScope3 =
-                new RefObject<RowCursor>(nullableScope);
-            while (scope.MoveNext(row, tempRef_nullableScope3)) {
-                nullableScope = tempRef_nullableScope3.get();
-                RefObject<RowCursor> tempRef_scope3 =
-                    new RefObject<RowCursor>(scope);
+            Reference<RowCursor> tempReference_nullableScope3 =
+                new Reference<RowCursor>(nullableScope);
+            while (scope.MoveNext(row, tempReference_nullableScope3)) {
+                nullableScope = tempReference_nullableScope3.get();
+                Reference<RowCursor> tempReference_scope3 =
+                    new Reference<RowCursor>(scope);
                 String item;
-                OutObject<TValue> tempOut_item3 = new OutObject<TValue>();
-                OutObject<RowCursor> tempOut_nullableScope3 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_scope3, c.TypeArgs[0],
+                Out<TValue> tempOut_item3 = new Out<TValue>();
+                Out<RowCursor> tempOut_nullableScope3 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_scope3, c.TypeArgs[0],
                     tempOut_item3, tempOut_nullableScope3));
                 nullableScope = tempOut_nullableScope3.get();
                 item = tempOut_item3.get();
-                scope = tempRef_scope3.get();
+                scope = tempReference_scope3.get();
                 value.NullSet.add(item);
             }
-            nullableScope = tempRef_nullableScope3.get();
+            nullableScope = tempReference_nullableScope3.get();
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nulltuple", out c);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref scope, out scope) == Result.Success) {
             value.NullTuple = new ArrayList<(Integer, Long) > ();
             RowCursor tupleScope = null;
             TypeArgument tupleType = c.TypeArgs[0];
-            RefObject<RowCursor> tempRef_tupleScope =
-                new RefObject<RowCursor>(tupleScope);
-            while (scope.MoveNext(row, tempRef_tupleScope)) {
-                tupleScope = tempRef_tupleScope.get();
-                RefObject<RowCursor> tempRef_scope4 =
-                    new RefObject<RowCursor>(scope);
-                OutObject<RowCursor> tempOut_tupleScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row, tempRef_scope4,
+            Reference<RowCursor> tempReference_tupleScope =
+                new Reference<RowCursor>(tupleScope);
+            while (scope.MoveNext(row, tempReference_tupleScope)) {
+                tupleScope = tempReference_tupleScope.get();
+                Reference<RowCursor> tempReference_scope4 =
+                    new Reference<RowCursor>(scope);
+                Out<RowCursor> tempOut_tupleScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row, tempReference_scope4,
                     tempOut_tupleScope));
                 tupleScope = tempOut_tupleScope.get();
-                scope = tempRef_scope4.get();
+                scope = tempReference_scope4.get();
 
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
                     , row);
-                RefObject<RowCursor> tempRef_tupleScope2 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope2 =
+                    new Reference<RowCursor>(tupleScope);
                 Nullable<Integer> item1;
-                OutObject<TValue> tempOut_item1 = new OutObject<TValue>();
+                Out<TValue> tempOut_item1 = new Out<TValue>();
                 RowCursor nullableScope;
-                OutObject<RowCursor> tempOut_nullableScope4 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_tupleScope2,
+                Out<RowCursor> tempOut_nullableScope4 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_tupleScope2,
                     tupleType.getTypeArgs().get(0).clone(), tempOut_item1, tempOut_nullableScope4));
                 nullableScope = tempOut_nullableScope4.get();
                 item1 = tempOut_item1.get();
-                tupleScope = tempRef_tupleScope2.get();
-                RefObject<RowCursor> tempRef_nullableScope4 =
-                    new RefObject<RowCursor>(nullableScope);
+                tupleScope = tempReference_tupleScope2.get();
+                Reference<RowCursor> tempReference_nullableScope4 =
+                    new Reference<RowCursor>(nullableScope);
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
-                    , row, tempRef_nullableScope4);
-                nullableScope = tempRef_nullableScope4.get();
-                RefObject<RowCursor> tempRef_tupleScope3 =
-                    new RefObject<RowCursor>(tupleScope);
+                    , row, tempReference_nullableScope4);
+                nullableScope = tempReference_nullableScope4.get();
+                Reference<RowCursor> tempReference_tupleScope3 =
+                    new Reference<RowCursor>(tupleScope);
                 Nullable<Long> item2;
-                OutObject<TValue> tempOut_item2 = new OutObject<TValue>();
-                OutObject<RowCursor> tempOut_nullableScope5 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_tupleScope3,
+                Out<TValue> tempOut_item2 = new Out<TValue>();
+                Out<RowCursor> tempOut_nullableScope5 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_tupleScope3,
                     tupleType.getTypeArgs().get(1).clone(), tempOut_item2, tempOut_nullableScope5));
                 nullableScope = tempOut_nullableScope5.get();
                 item2 = tempOut_item2.get();
-                tupleScope = tempRef_tupleScope3.get();
+                tupleScope = tempReference_tupleScope3.get();
 
-                RefObject<RowCursor> tempRef_nullableScope5 =
-                    new RefObject<RowCursor>(nullableScope);
-                assert !RowCursorExtensions.MoveNext(tupleScope.clone(), row, tempRef_nullableScope5);
-                nullableScope = tempRef_nullableScope5.get();
+                Reference<RowCursor> tempReference_nullableScope5 =
+                    new Reference<RowCursor>(nullableScope);
+                assert !RowCursorExtensions.MoveNext(tupleScope.clone(), row, tempReference_nullableScope5);
+                nullableScope = tempReference_nullableScope5.get();
                 value.NullTuple.add((item1, item2))
             }
-            tupleScope = tempRef_tupleScope.get();
+            tupleScope = tempReference_tupleScope.get();
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nullmap", out c);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref scope, out scope) == Result.Success) {
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: value.NullMap = new Dictionary<Guid, Nullable<byte>>();
             value.NullMap = new HashMap<UUID, Byte>();
             RowCursor tupleScope = null;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             TypeArgument tupleType = c.<LayoutUniqueScope>TypeAs().FieldType(ref scope);
-            RefObject<RowCursor> tempRef_tupleScope4 =
-                new RefObject<RowCursor>(tupleScope);
-            while (scope.MoveNext(row, tempRef_tupleScope4)) {
-                tupleScope = tempRef_tupleScope4.get();
-                RefObject<RowCursor> tempRef_scope5 =
-                    new RefObject<RowCursor>(scope);
-                OutObject<RowCursor> tempOut_tupleScope2 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row, tempRef_scope5,
+            Reference<RowCursor> tempReference_tupleScope4 =
+                new Reference<RowCursor>(tupleScope);
+            while (scope.MoveNext(row, tempReference_tupleScope4)) {
+                tupleScope = tempReference_tupleScope4.get();
+                Reference<RowCursor> tempReference_scope5 =
+                    new Reference<RowCursor>(scope);
+                Out<RowCursor> tempOut_tupleScope2 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().ReadScope(row, tempReference_scope5,
                     tempOut_tupleScope2));
                 tupleScope = tempOut_tupleScope2.get();
-                scope = tempRef_scope5.get();
+                scope = tempReference_scope5.get();
 
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
                     , row);
-                RefObject<RowCursor> tempRef_tupleScope5 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope5 =
+                    new Reference<RowCursor>(tupleScope);
                 Nullable<java.util.UUID> itemKey;
-                OutObject<TValue> tempOut_itemKey = new OutObject<TValue>();
+                Out<TValue> tempOut_itemKey = new Out<TValue>();
                 RowCursor nullableScope;
-                OutObject<RowCursor> tempOut_nullableScope6 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_tupleScope5,
+                Out<RowCursor> tempOut_nullableScope6 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_tupleScope5,
                     tupleType.getTypeArgs().get(0).clone(), tempOut_itemKey, tempOut_nullableScope6));
                 nullableScope = tempOut_nullableScope6.get();
                 itemKey = tempOut_itemKey.get();
-                tupleScope = tempRef_tupleScope5.get();
+                tupleScope = tempReference_tupleScope5.get();
 
-                RefObject<RowCursor> tempRef_nullableScope6 =
-                    new RefObject<RowCursor>(nullableScope);
+                Reference<RowCursor> tempReference_nullableScope6 =
+                    new Reference<RowCursor>(nullableScope);
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
-                    , row, tempRef_nullableScope6);
-                nullableScope = tempRef_nullableScope6.get();
-                RefObject<RowCursor> tempRef_tupleScope6 =
-                    new RefObject<RowCursor>(tupleScope);
+                    , row, tempReference_nullableScope6);
+                nullableScope = tempReference_nullableScope6.get();
+                Reference<RowCursor> tempReference_tupleScope6 =
+                    new Reference<RowCursor>(tupleScope);
                 Nullable<Byte> itemValue;
-                OutObject<TValue> tempOut_itemValue = new OutObject<TValue>();
-                OutObject<RowCursor> tempOut_nullableScope7 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempRef_tupleScope6,
+                Out<TValue> tempOut_itemValue = new Out<TValue>();
+                Out<RowCursor> tempOut_nullableScope7 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.ReadNullable(row, tempReference_tupleScope6,
                     tupleType.getTypeArgs().get(1).clone(), tempOut_itemValue, tempOut_nullableScope7));
                 nullableScope = tempOut_nullableScope7.get();
                 itemValue = tempOut_itemValue.get();
-                tupleScope = tempRef_tupleScope6.get();
+                tupleScope = tempReference_tupleScope6.get();
 
-                RefObject<RowCursor> tempRef_nullableScope7 =
-                    new RefObject<RowCursor>(nullableScope);
-                assert !RowCursorExtensions.MoveNext(tupleScope.clone(), row, tempRef_nullableScope7);
-                nullableScope = tempRef_nullableScope7.get();
+                Reference<RowCursor> tempReference_nullableScope7 =
+                    new Reference<RowCursor>(nullableScope);
+                assert !RowCursorExtensions.MoveNext(tupleScope.clone(), row, tempReference_nullableScope7);
+                nullableScope = tempReference_nullableScope7.get();
                 value.NullMap.put(itemKey != null ? itemKey : UUID.Empty, itemValue);
             }
-            tupleScope = tempRef_tupleScope4.get();
+            tupleScope = tempReference_tupleScope4.get();
         }
 
         return value;
@@ -386,24 +387,24 @@ public final class NullableUnitTests {
     // TODO: C# TO JAVA CONVERTER: The C# 'struct' constraint has no equivalent in Java:
     //ORIGINAL LINE: private static Result WriteNullable<TValue>(ref RowBuffer row, ref RowCursor scope, TypeArgument
     // itemType, Nullable<TValue> item, out RowCursor nullableScope) where TValue : struct
-    private static <TValue> Result WriteNullable(RefObject<RowBuffer> row,
-                                                 RefObject<RowCursor> scope, TypeArgument itemType,
-                                                 TValue item, OutObject<RowCursor> nullableScope) {
+    private static <TValue> Result WriteNullable(Reference<RowBuffer> row,
+                                                 Reference<RowCursor> scope, TypeArgument itemType,
+                                                 TValue item, Out<RowCursor> nullableScope) {
         return NullableUnitTests.WriteNullableImpl(row, scope, itemType.clone(), item != null, item != null ? item :
         default,nullableScope.clone())
     }
 
-    private static <TValue> Result WriteNullable(RefObject<RowBuffer> row,
-                                                 RefObject<RowCursor> scope, TypeArgument itemType,
-                                                 TValue item, OutObject<RowCursor> nullableScope) {
+    private static <TValue> Result WriteNullable(Reference<RowBuffer> row,
+                                                 Reference<RowCursor> scope, TypeArgument itemType,
+                                                 TValue item, Out<RowCursor> nullableScope) {
         return NullableUnitTests.WriteNullableImpl(row, scope, itemType.clone(), item != null, item,
             nullableScope.clone());
     }
 
-    private static <TValue> Result WriteNullableImpl(RefObject<RowBuffer> row,
-                                                     RefObject<RowCursor> scope, TypeArgument itemType,
+    private static <TValue> Result WriteNullableImpl(Reference<RowBuffer> row,
+                                                     Reference<RowCursor> scope, TypeArgument itemType,
                                                      boolean hasValue, TValue item,
-                                                     OutObject<RowCursor> nullableScope) {
+                                                     Out<RowCursor> nullableScope) {
         Result r = itemType.<LayoutNullable>TypeAs().WriteScope(row, scope, itemType.getTypeArgs().clone(), hasValue,
             nullableScope);
 
@@ -420,203 +421,204 @@ public final class NullableUnitTests {
         return Result.Success;
     }
 
-    private void WriteNullables(RefObject<RowBuffer> row, RefObject<RowCursor> root,
+    private void WriteNullables(Reference<RowBuffer> row, Reference<RowCursor> root,
                                 Nullables value) {
         LayoutColumn c;
 
         if (value.NullBool != null) {
-            OutObject<LayoutColumn> tempOut_c =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nullbool", tempOut_c);
             c = tempOut_c.get();
             RowCursor outerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out outerScope).Find(row, c.getPath());
-            RefObject<RowCursor> tempRef_outerScope =
-                new RefObject<RowCursor>(outerScope);
-            OutObject<RowCursor> tempOut_outerScope =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempRef_outerScope,
+            Reference<RowCursor> tempReference_outerScope =
+                new Reference<RowCursor>(outerScope);
+            Out<RowCursor> tempOut_outerScope =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempReference_outerScope,
                 c.getTypeArgs().clone(), tempOut_outerScope));
             outerScope = tempOut_outerScope.get();
-            outerScope = tempRef_outerScope.get();
+            outerScope = tempReference_outerScope.get();
             for (Boolean item : value.NullBool) {
-                RefObject<RowCursor> tempRef_outerScope2 =
-                    new RefObject<RowCursor>(outerScope);
+                Reference<RowCursor> tempReference_outerScope2 =
+                    new Reference<RowCursor>(outerScope);
                 RowCursor innerScope;
-                OutObject<RowCursor> tempOut_innerScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_outerScope2,
+                Out<RowCursor> tempOut_innerScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_outerScope2,
                     c.getTypeArgs().get(0).clone(), item, tempOut_innerScope));
                 innerScope = tempOut_innerScope.get();
-                outerScope = tempRef_outerScope2.get();
+                outerScope = tempReference_outerScope2.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !outerScope.MoveNext(row, ref innerScope);
             }
         }
 
         if (value.NullArray != null) {
-            OutObject<LayoutColumn> tempOut_c2 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c2 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nullarray", tempOut_c2);
             c = tempOut_c2.get();
             RowCursor outerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out outerScope).Find(row, c.getPath());
-            RefObject<RowCursor> tempRef_outerScope3 =
-                new RefObject<RowCursor>(outerScope);
-            OutObject<RowCursor> tempOut_outerScope2 =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempRef_outerScope3,
+            Reference<RowCursor> tempReference_outerScope3 =
+                new Reference<RowCursor>(outerScope);
+            Out<RowCursor> tempOut_outerScope2 =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempReference_outerScope3,
                 c.getTypeArgs().clone(), tempOut_outerScope2));
             outerScope = tempOut_outerScope2.get();
-            outerScope = tempRef_outerScope3.get();
+            outerScope = tempReference_outerScope3.get();
             for (Float item : value.NullArray) {
-                RefObject<RowCursor> tempRef_outerScope4 =
-                    new RefObject<RowCursor>(outerScope);
+                Reference<RowCursor> tempReference_outerScope4 =
+                    new Reference<RowCursor>(outerScope);
                 RowCursor innerScope;
-                OutObject<RowCursor> tempOut_innerScope2 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_outerScope4,
+                Out<RowCursor> tempOut_innerScope2 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_outerScope4,
                     c.getTypeArgs().get(0).clone(), item, tempOut_innerScope2));
                 innerScope = tempOut_innerScope2.get();
-                outerScope = tempRef_outerScope4.get();
+                outerScope = tempReference_outerScope4.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !outerScope.MoveNext(row, ref innerScope);
             }
         }
 
         if (value.NullSet != null) {
-            OutObject<LayoutColumn> tempOut_c3 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c3 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nullset", tempOut_c3);
             c = tempOut_c3.get();
             RowCursor outerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out outerScope).Find(row, c.getPath());
-            RefObject<RowCursor> tempRef_outerScope5 =
-                new RefObject<RowCursor>(outerScope);
-            OutObject<RowCursor> tempOut_outerScope3 =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(c.<LayoutTypedSet>TypeAs().WriteScope(row, tempRef_outerScope5,
+            Reference<RowCursor> tempReference_outerScope5 =
+                new Reference<RowCursor>(outerScope);
+            Out<RowCursor> tempOut_outerScope3 =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(c.<LayoutTypedSet>TypeAs().WriteScope(row, tempReference_outerScope5,
                 c.getTypeArgs().clone(), tempOut_outerScope3));
             outerScope = tempOut_outerScope3.get();
-            outerScope = tempRef_outerScope5.get();
+            outerScope = tempReference_outerScope5.get();
             for (String item : value.NullSet) {
                 RowCursor temp;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 RowCursor.CreateForAppend(row, out temp).Find(row, "");
-                RefObject<RowCursor> tempRef_temp =
-                    new RefObject<RowCursor>(temp);
+                Reference<RowCursor> tempReference_temp =
+                    new Reference<RowCursor>(temp);
                 RowCursor _;
-                OutObject<RowCursor> tempOut__ =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_temp,
+                Out<RowCursor> tempOut__ =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_temp,
                     c.getTypeArgs().get(0).clone(), item, tempOut__));
                 _ = tempOut__.get();
-                temp = tempRef_temp.get();
-                RefObject<RowCursor> tempRef_outerScope6 =
-                    new RefObject<RowCursor>(outerScope);
-                RefObject<RowCursor> tempRef_temp2 =
-                    new RefObject<RowCursor>(temp);
-                ResultAssert.IsSuccess(c.<LayoutTypedSet>TypeAs().MoveField(row, tempRef_outerScope6, tempRef_temp2));
-                temp = tempRef_temp2.get();
-                outerScope = tempRef_outerScope6.get();
+                temp = tempReference_temp.get();
+                Reference<RowCursor> tempReference_outerScope6 =
+                    new Reference<RowCursor>(outerScope);
+                Reference<RowCursor> tempReference_temp2 =
+                    new Reference<RowCursor>(temp);
+                ResultAssert.IsSuccess(c.<LayoutTypedSet>TypeAs().MoveField(row, tempReference_outerScope6,
+                    tempReference_temp2));
+                temp = tempReference_temp2.get();
+                outerScope = tempReference_outerScope6.get();
             }
         }
 
         if (value.NullTuple != null) {
-            OutObject<LayoutColumn> tempOut_c4 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c4 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nulltuple", tempOut_c4);
             c = tempOut_c4.get();
             RowCursor outerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out outerScope).Find(row, c.getPath());
-            RefObject<RowCursor> tempRef_outerScope7 =
-                new RefObject<RowCursor>(outerScope);
-            OutObject<RowCursor> tempOut_outerScope4 =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempRef_outerScope7,
+            Reference<RowCursor> tempReference_outerScope7 =
+                new Reference<RowCursor>(outerScope);
+            Out<RowCursor> tempOut_outerScope4 =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, tempReference_outerScope7,
                 c.getTypeArgs().clone(), tempOut_outerScope4));
             outerScope = tempOut_outerScope4.get();
-            outerScope = tempRef_outerScope7.get();
+            outerScope = tempReference_outerScope7.get();
             for ((Integer item1,Long item2) :value.NullTuple)
             {
                 TypeArgument tupleType = c.getTypeArgs().get(0).clone();
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().WriteScope(row, ref outerScope,
                     tupleType.getTypeArgs().clone(), out tupleScope));
 
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor nullableScope;
-                OutObject<RowCursor> tempOut_nullableScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_tupleScope,
+                Out<RowCursor> tempOut_nullableScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_tupleScope,
                     tupleType.getTypeArgs().get(0).clone(), item1, tempOut_nullableScope));
                 nullableScope = tempOut_nullableScope.get();
-                tupleScope = tempRef_tupleScope.get();
+                tupleScope = tempReference_tupleScope.get();
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert tupleScope.MoveNext(row, ref nullableScope);
-                RefObject<RowCursor> tempRef_tupleScope2 =
-                    new RefObject<RowCursor>(tupleScope);
-                OutObject<RowCursor> tempOut_nullableScope2 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_tupleScope2,
+                Reference<RowCursor> tempReference_tupleScope2 =
+                    new Reference<RowCursor>(tupleScope);
+                Out<RowCursor> tempOut_nullableScope2 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_tupleScope2,
                     tupleType.getTypeArgs().get(1).clone(), item2, tempOut_nullableScope2));
                 nullableScope = tempOut_nullableScope2.get();
-                tupleScope = tempRef_tupleScope2.get();
+                tupleScope = tempReference_tupleScope2.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !tupleScope.MoveNext(row, ref nullableScope);
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !outerScope.MoveNext(row, ref tupleScope);
             }
         }
 
         if (value.NullMap != null) {
-            OutObject<LayoutColumn> tempOut_c5 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c5 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nullmap", tempOut_c5);
             c = tempOut_c5.get();
             RowCursor outerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out outerScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref outerScope,
                 c.getTypeArgs().clone(), out outerScope));
@@ -624,62 +626,62 @@ public final class NullableUnitTests {
             //ORIGINAL LINE: foreach ((Guid key, Nullable<byte> itemValue) in value.NullMap)
             for ((UUID key,Byte itemValue) :value.NullMap)
             {
-                RefObject<RowCursor> tempRef_outerScope8 =
-                    new RefObject<RowCursor>(outerScope);
-                TypeArgument tupleType = c.<LayoutUniqueScope>TypeAs().FieldType(tempRef_outerScope8).clone();
-                outerScope = tempRef_outerScope8.get();
+                Reference<RowCursor> tempReference_outerScope8 =
+                    new Reference<RowCursor>(outerScope);
+                TypeArgument tupleType = c.<LayoutUniqueScope>TypeAs().FieldType(tempReference_outerScope8).clone();
+                outerScope = tempReference_outerScope8.get();
                 RowCursor temp;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 RowCursor.CreateForAppend(row, out temp).Find(row, "");
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().WriteScope(row, ref temp,
                     tupleType.getTypeArgs().clone(), out tupleScope));
 
                 UUID itemKey = key.equals(UUID.Empty) ? null : key;
-                RefObject<RowCursor> tempRef_tupleScope3 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope3 =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor nullableScope;
-                OutObject<RowCursor> tempOut_nullableScope3 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_tupleScope3,
+                Out<RowCursor> tempOut_nullableScope3 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_tupleScope3,
                     tupleType.getTypeArgs().get(0).clone(), itemKey, tempOut_nullableScope3));
                 nullableScope = tempOut_nullableScope3.get();
-                tupleScope = tempRef_tupleScope3.get();
+                tupleScope = tempReference_tupleScope3.get();
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert tupleScope.MoveNext(row, ref nullableScope);
-                RefObject<RowCursor> tempRef_tupleScope4 =
-                    new RefObject<RowCursor>(tupleScope);
-                OutObject<RowCursor> tempOut_nullableScope4 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempRef_tupleScope4,
+                Reference<RowCursor> tempReference_tupleScope4 =
+                    new Reference<RowCursor>(tupleScope);
+                Out<RowCursor> tempOut_nullableScope4 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(NullableUnitTests.WriteNullable(row, tempReference_tupleScope4,
                     tupleType.getTypeArgs().get(1).clone(), itemValue, tempOut_nullableScope4));
                 nullableScope = tempOut_nullableScope4.get();
-                tupleScope = tempRef_tupleScope4.get();
+                tupleScope = tempReference_tupleScope4.get();
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !tupleScope.MoveNext(row, ref nullableScope);
 
-                RefObject<RowCursor> tempRef_outerScope9 =
-                    new RefObject<RowCursor>(outerScope);
-                RefObject<RowCursor> tempRef_temp3 =
-                    new RefObject<RowCursor>(temp);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_outerScope9,
-                    tempRef_temp3));
-                temp = tempRef_temp3.get();
-                outerScope = tempRef_outerScope9.get();
+                Reference<RowCursor> tempReference_outerScope9 =
+                    new Reference<RowCursor>(outerScope);
+                Reference<RowCursor> tempReference_temp3 =
+                    new Reference<RowCursor>(temp);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_outerScope9,
+                    tempReference_temp3));
+                temp = tempReference_temp3.get();
+                outerScope = tempReference_outerScope9.get();
             }
         }
     }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/PermuteExtensions.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/PermuteExtensions.java
index 823bafb..7c0e016 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/PermuteExtensions.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/PermuteExtensions.java
@@ -5,7 +5,7 @@
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
 /**
- * Extension methods for computing permutations of <see cref="IEnumerable{T}"/>.
+ * Extension methods for computing permutations of {@link IEnumerable{T}}.
  */
 public final class PermuteExtensions {
     /**
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/ReadRowDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/ReadRowDispatcher.java
index 6fe2d7e..9a29464 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/ReadRowDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/ReadRowDispatcher.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutType;
@@ -20,39 +21,39 @@ import java.util.List;
 //ORIGINAL LINE: internal struct ReadRowDispatcher : IDispatcher
 public final class ReadRowDispatcher implements IDispatcher {
 
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t) {
         Dispatch(dispatcher, root, col, t, null);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public void Dispatch<TLayout, TValue>(ref RowOperationDispatcher dispatcher, ref RowCursor root,
     // LayoutColumn col, LayoutType t, TValue expected = default) where TLayout : LayoutType<TValue>
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> root, LayoutColumn col, LayoutType t, TValue expected) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> root, LayoutColumn col, LayoutType t, TValue expected) {
         TValue value;
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_Row =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                OutObject<TValue> tempOut_value = new OutObject<TValue>();
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadFixed(tempRef_Row, root, col, tempOut_value));
+                Reference<RowBuffer> tempReference_Row =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                Out<TValue> tempOut_value = new Out<TValue>();
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadFixed(tempReference_Row, root, col, tempOut_value));
                 value = tempOut_value.get();
-                dispatcher.get().argValue.Row = tempRef_Row.get();
+                dispatcher.get().argValue.Row = tempReference_Row.get();
                 break;
             case Variable:
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                OutObject<TValue> tempOut_value2 = new OutObject<TValue>();
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadVariable(tempRef_Row2, root, col, tempOut_value2));
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                Out<TValue> tempOut_value2 = new Out<TValue>();
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadVariable(tempReference_Row2, root, col, tempOut_value2));
                 value = tempOut_value2.get();
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 break;
             default:
-                RefObject<RowBuffer> tempRef_Row3 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                OutObject<TValue> tempOut_value3 = new OutObject<TValue>();
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadSparse(tempRef_Row3, root, tempOut_value3));
+                Reference<RowBuffer> tempReference_Row3 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                Out<TValue> tempOut_value3 = new Out<TValue>();
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().ReadSparse(tempReference_Row3, root, tempOut_value3));
                 value = tempOut_value3.get();
-                dispatcher.get().argValue.Row = tempRef_Row3.get();
+                dispatcher.get().argValue.Row = tempReference_Row3.get();
                 break;
         }
 
@@ -63,178 +64,178 @@ public final class ReadRowDispatcher implements IDispatcher {
         }
     }
 
-    public void DispatchArray(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchArray(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor arrayScope;
-        OutObject<RowCursor> tempOut_arrayScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().ReadScope(tempRef_Row, scope, tempOut_arrayScope));
+        Out<RowCursor> tempOut_arrayScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().ReadScope(tempReference_Row, scope, tempOut_arrayScope));
         arrayScope = tempOut_arrayScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         int i = 0;
         List items = (List)value;
-        RefObject<RowBuffer> tempRef_Row2 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        while (arrayScope.MoveNext(tempRef_Row2)) {
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+        Reference<RowBuffer> tempReference_Row2 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        while (arrayScope.MoveNext(tempReference_Row2)) {
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref arrayScope, null, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), items.get(i++));
         }
-        dispatcher.get().argValue.Row = tempRef_Row2.get();
+        dispatcher.get().argValue.Row = tempReference_Row2.get();
     }
 
-    public void DispatchMap(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchMap(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 2);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor mapScope;
-        OutObject<RowCursor> tempOut_mapScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().ReadScope(tempRef_Row, scope, tempOut_mapScope));
+        Out<RowCursor> tempOut_mapScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().ReadScope(tempReference_Row, scope, tempOut_mapScope));
         mapScope = tempOut_mapScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         int i = 0;
         List items = (List)value;
-        RefObject<RowBuffer> tempRef_Row2 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        while (mapScope.MoveNext(tempRef_Row2)) {
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+        Reference<RowBuffer> tempReference_Row2 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        while (mapScope.MoveNext(tempReference_Row2)) {
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref mapScope, null, LayoutType.TypedTuple, typeArgs.clone(),
                 items.get(i++));
         }
-        dispatcher.get().argValue.Row = tempRef_Row2.get();
+        dispatcher.get().argValue.Row = tempReference_Row2.get();
     }
 
-    public void DispatchNullable(RefObject<RowOperationDispatcher> dispatcher,
-                                 RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchNullable(Reference<RowOperationDispatcher> dispatcher,
+                                 Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                                  Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor nullableScope;
-        OutObject<RowCursor> tempOut_nullableScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().ReadScope(tempRef_Row, scope, tempOut_nullableScope));
+        Out<RowCursor> tempOut_nullableScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().ReadScope(tempReference_Row, scope, tempOut_nullableScope));
         nullableScope = tempOut_nullableScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         if (value != null) {
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            RefObject<RowCursor> tempRef_nullableScope =
-                new RefObject<RowCursor>(nullableScope);
-            ResultAssert.IsSuccess(LayoutNullable.HasValue(tempRef_Row2, tempRef_nullableScope));
-            nullableScope = tempRef_nullableScope.get();
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
-            RefObject<RowBuffer> tempRef_Row3 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            nullableScope.MoveNext(tempRef_Row3);
-            dispatcher.get().argValue.Row = tempRef_Row3.get();
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            Reference<RowCursor> tempReference_nullableScope =
+                new Reference<RowCursor>(nullableScope);
+            ResultAssert.IsSuccess(LayoutNullable.HasValue(tempReference_Row2, tempReference_nullableScope));
+            nullableScope = tempReference_nullableScope.get();
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
+            Reference<RowBuffer> tempReference_Row3 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            nullableScope.MoveNext(tempReference_Row3);
+            dispatcher.get().argValue.Row = tempReference_Row3.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref nullableScope, null, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), value);
         } else {
-            RefObject<RowBuffer> tempRef_Row4 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            RefObject<RowCursor> tempRef_nullableScope2 =
-                new RefObject<RowCursor>(nullableScope);
-            ResultAssert.NotFound(LayoutNullable.HasValue(tempRef_Row4, tempRef_nullableScope2));
-            nullableScope = tempRef_nullableScope2.get();
-            dispatcher.get().argValue.Row = tempRef_Row4.get();
+            Reference<RowBuffer> tempReference_Row4 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            Reference<RowCursor> tempReference_nullableScope2 =
+                new Reference<RowCursor>(nullableScope);
+            ResultAssert.NotFound(LayoutNullable.HasValue(tempReference_Row4, tempReference_nullableScope2));
+            nullableScope = tempReference_nullableScope2.get();
+            dispatcher.get().argValue.Row = tempReference_Row4.get();
         }
     }
 
-    public void DispatchObject(RefObject<RowOperationDispatcher> dispatcher,
-                               RefObject<RowCursor> scope) {
+    public void DispatchObject(Reference<RowOperationDispatcher> dispatcher,
+                               Reference<RowCursor> scope) {
     }
 
-    public void DispatchSet(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchSet(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor setScope;
-        OutObject<RowCursor> tempOut_setScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().ReadScope(tempRef_Row, scope, tempOut_setScope));
+        Out<RowCursor> tempOut_setScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().ReadScope(tempReference_Row, scope, tempOut_setScope));
         setScope = tempOut_setScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         int i = 0;
         List items = (List)value;
-        RefObject<RowBuffer> tempRef_Row2 =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
-        while (setScope.MoveNext(tempRef_Row2)) {
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+        Reference<RowBuffer> tempReference_Row2 =
+            new Reference<RowBuffer>(dispatcher.get().Row);
+        while (setScope.MoveNext(tempReference_Row2)) {
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref setScope, null, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), items.get(i++));
         }
-        dispatcher.get().argValue.Row = tempRef_Row2.get();
+        dispatcher.get().argValue.Row = tempReference_Row2.get();
     }
 
-    public void DispatchTuple(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchTuple(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() >= 2);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor tupleScope;
-        OutObject<RowCursor> tempOut_tupleScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().ReadScope(tempRef_Row, scope, tempOut_tupleScope));
+        Out<RowCursor> tempOut_tupleScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().ReadScope(tempReference_Row, scope, tempOut_tupleScope));
         tupleScope = tempOut_tupleScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         for (int i = 0; i < typeArgs.getCount(); i++) {
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            tupleScope.MoveNext(tempRef_Row2);
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            tupleScope.MoveNext(tempReference_Row2);
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             PropertyInfo valueAccessor = value.getClass().GetProperty(String.format("Item%1$s", i + 1));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref tupleScope, null, typeArgs.get(i).getType(),
                 typeArgs.get(i).getTypeArgs().clone(), valueAccessor.GetValue(value));
         }
     }
 
-    public void DispatchUDT(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchUDT(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
-        RefObject<RowBuffer> tempRef_Row = new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row = new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor udtScope;
-        OutObject<RowCursor> tempOut_udtScope = new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().ReadScope(tempRef_Row, scope, tempOut_udtScope));
+        Out<RowCursor> tempOut_udtScope = new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().ReadScope(tempReference_Row, scope, tempOut_udtScope));
         udtScope = tempOut_udtScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         IDispatchable valueDispatcher = value instanceof IDispatchable ? (IDispatchable)value : null;
         assert valueDispatcher != null;
-        RefObject<RowCursor> tempRef_udtScope = new RefObject<RowCursor>(udtScope);
-        valueDispatcher.Dispatch(dispatcher, tempRef_udtScope);
-        udtScope = tempRef_udtScope.get();
+        Reference<RowCursor> tempReference_udtScope = new Reference<RowCursor>(udtScope);
+        valueDispatcher.Dispatch(dispatcher, tempReference_udtScope);
+        udtScope = tempReference_udtScope.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RecordIOUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RecordIOUnitTests.java
index f51c0cf..af2e4fa 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RecordIOUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RecordIOUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.MemorySpanResizer;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
@@ -102,7 +103,7 @@ public class RecordIOUnitTests {
                     return Result.Success;
                 }
 
-                OutObject<ReadOnlyMemory<Byte>> tempOut_body = new OutObject<ReadOnlyMemory<Byte>>();
+                Out<ReadOnlyMemory<Byte>> tempOut_body = new Out<ReadOnlyMemory<Byte>>();
                 Task tempVar5 = this.WriteAddress(resizer, addresses[index], tempOut_body);
                 body = tempOut_body.get();
                 return tempVar5;
@@ -121,7 +122,7 @@ public class RecordIOUnitTests {
                 assert !record.IsEmpty;
 
                 Address obj;
-                OutObject<Address> tempOut_obj = new OutObject<Address>();
+                Out<Address> tempOut_obj = new Out<Address>();
                 r = this.ReadAddress(record, tempOut_obj);
                 obj = tempOut_obj.get();
                 ResultAssert.IsSuccess(r);
@@ -132,8 +133,8 @@ public class RecordIOUnitTests {
                 assert !segment.IsEmpty;
 
                 Segment obj;
-                OutObject<Segment> tempOut_obj =
-                    new OutObject<Segment>();
+                Out<Segment> tempOut_obj =
+                    new Out<Segment>();
                 r = this.ReadSegment(segment, tempOut_obj);
                 obj = tempOut_obj.get();
                 ResultAssert.IsSuccess(r);
@@ -154,21 +155,21 @@ public class RecordIOUnitTests {
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: private Result ReadAddress(Memory<byte> buffer, out Address obj)
-    private Result ReadAddress(Memory<Byte> buffer, OutObject<Address> obj) {
+    private Result ReadAddress(Memory<Byte> buffer, Out<Address> obj) {
         RowBuffer row = new RowBuffer(buffer.Span, HybridRowVersion.V1, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row);
+        row = tempReference_row.get();
 
         // Use the reader to dump to the screen.
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
         String str;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Result r = DiagnosticConverter.ReaderToString(tempRef_reader, out str);
-        reader = tempRef_reader.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Result r = DiagnosticConverter.ReaderToString(tempReference_reader, out str);
+        reader = tempReference_reader.get();
         if (r != Result.Success) {
             obj.set(null);
             return r;
@@ -177,33 +178,33 @@ public class RecordIOUnitTests {
         System.out.println(str);
 
         // Reset the reader and materialize the object.
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        reader = new RowReader(tempRef_row2);
-        row = tempRef_row2.get();
-        RefObject<RowReader> tempRef_reader2 =
-            new RefObject<RowReader>(reader);
-        Result tempVar = AddressSerializer.Read(tempRef_reader2, obj);
-        reader = tempRef_reader2.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        reader = new RowReader(tempReference_row2);
+        row = tempReference_row2.get();
+        Reference<RowReader> tempReference_reader2 =
+            new Reference<RowReader>(reader);
+        Result tempVar = AddressSerializer.Read(tempReference_reader2, obj);
+        reader = tempReference_reader2.get();
         return tempVar;
     }
 
     //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
     //ORIGINAL LINE: private Result ReadSegment(Memory<byte> buffer, out Segment obj)
-    private Result ReadSegment(Memory<Byte> buffer, OutObject<Segment> obj) {
+    private Result ReadSegment(Memory<Byte> buffer, Out<Segment> obj) {
         RowBuffer row = new RowBuffer(buffer.Span, HybridRowVersion.V1, SystemSchema.LayoutResolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row);
+        row = tempReference_row.get();
 
         // Use the reader to dump to the screen.
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
         String str;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Result r = DiagnosticConverter.ReaderToString(tempRef_reader, out str);
-        reader = tempRef_reader.get();
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Result r = DiagnosticConverter.ReaderToString(tempReference_reader, out str);
+        reader = tempReference_reader.get();
         if (r != Result.Success) {
             obj.set(null);
             return r;
@@ -212,12 +213,12 @@ public class RecordIOUnitTests {
         System.out.println(str);
 
         // Reset the reader and materialize the object.
-        RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(row);
-        reader = new RowReader(tempRef_row2);
-        row = tempRef_row2.get();
-        RefObject<RowReader> tempRef_reader2 = new RefObject<RowReader>(reader);
-        Result tempVar = SegmentSerializer.Read(tempRef_reader2, obj.clone());
-        reader = tempRef_reader2.get();
+        Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(row);
+        reader = new RowReader(tempReference_row2);
+        row = tempReference_row2.get();
+        Reference<RowReader> tempReference_reader2 = new Reference<RowReader>(reader);
+        Result tempVar = SegmentSerializer.Read(tempReference_reader2, obj.clone());
+        reader = tempReference_reader2.get();
         return tempVar;
     }
 
@@ -225,13 +226,13 @@ public class RecordIOUnitTests {
     //ORIGINAL LINE: private Result WriteAddress(MemorySpanResizer<byte> resizer, Address obj, out
     // ReadOnlyMemory<byte> buffer)
     private Result WriteAddress(MemorySpanResizer<Byte> resizer, Address obj,
-                                OutObject<ReadOnlyMemory<Byte>> buffer) {
+                                Out<ReadOnlyMemory<Byte>> buffer) {
         RowBuffer row = new RowBuffer(RecordIOUnitTests.InitialRowSize, resizer);
         row.InitLayout(HybridRowVersion.V1, this.addressLayout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        Result r = RowWriter.WriteBuffer(tempRef_row, obj, AddressSerializer.Write);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Result r = RowWriter.WriteBuffer(tempReference_row, obj, AddressSerializer.Write);
+        row = tempReference_row.get();
         if (r != Result.Success) {
             buffer.set(null);
             return r;
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowOperationDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowOperationDispatcher.java
index edfa5c1..3103f8d 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowOperationDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowOperationDispatcher.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
@@ -93,11 +94,11 @@ public final class RowOperationDispatcher {
     }
 
     public RowReader GetReader() {
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(this.Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(this.Row);
         // TODO: C# TO JAVA CONVERTER: The following line could not be converted:
         return new RowReader(ref this.Row)
-        this.Row = tempRef_Row.get();
+        this.Row = tempReference_Row.get();
         return tempVar;
     }
 
@@ -121,43 +122,43 @@ public final class RowOperationDispatcher {
     //ORIGINAL LINE: public void LayoutCodeSwitch(string path = null, LayoutType type = null, TypeArgumentList
     // typeArgs = default, object value = null)
     public void LayoutCodeSwitch(String path, LayoutType type, TypeArgumentList typeArgs, Object value) {
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(this.Row);
-        RowCursor root = RowCursor.Create(tempRef_Row);
-        this.Row = tempRef_Row.get();
-        RefObject<RowCursor> tempRef_root =
-            new RefObject<RowCursor>(root);
-        this.LayoutCodeSwitch(tempRef_root, path, type, typeArgs.clone(), value);
-        root = tempRef_root.get();
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(this.Row);
+        RowCursor root = RowCursor.Create(tempReference_Row);
+        this.Row = tempReference_Row.get();
+        Reference<RowCursor> tempReference_root =
+            new Reference<RowCursor>(root);
+        this.LayoutCodeSwitch(tempReference_root, path, type, typeArgs.clone(), value);
+        root = tempReference_root.get();
     }
 
-    public void LayoutCodeSwitch(RefObject<RowCursor> scope, String path, LayoutType type,
+    public void LayoutCodeSwitch(Reference<RowCursor> scope, String path, LayoutType type,
                                  TypeArgumentList typeArgs) {
         LayoutCodeSwitch(scope, path, type, typeArgs, null);
     }
 
-    public void LayoutCodeSwitch(RefObject<RowCursor> scope, String path, LayoutType type) {
+    public void LayoutCodeSwitch(Reference<RowCursor> scope, String path, LayoutType type) {
         LayoutCodeSwitch(scope, path, type, null, null);
     }
 
-    public void LayoutCodeSwitch(RefObject<RowCursor> scope, String path) {
+    public void LayoutCodeSwitch(Reference<RowCursor> scope, String path) {
         LayoutCodeSwitch(scope, path, null, null, null);
     }
 
-    public void LayoutCodeSwitch(RefObject<RowCursor> scope) {
+    public void LayoutCodeSwitch(Reference<RowCursor> scope) {
         LayoutCodeSwitch(scope, null, null, null, null);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public void LayoutCodeSwitch(ref RowCursor scope, string path = null, LayoutType type = null,
     // TypeArgumentList typeArgs = default, object value = null)
-    public void LayoutCodeSwitch(RefObject<RowCursor> scope, String path, LayoutType type,
+    public void LayoutCodeSwitch(Reference<RowCursor> scope, String path, LayoutType type,
                                  TypeArgumentList typeArgs, Object value) {
         LayoutColumn col = null;
         if (type == null) {
             assert path != null;
-            OutObject<LayoutColumn> tempOut_col =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col =
+                new Out<LayoutColumn>();
             assert scope.get().getLayout().TryFind(path, tempOut_col);
             col = tempOut_col.get();
             assert col != null;
@@ -166,217 +167,217 @@ public final class RowOperationDispatcher {
         }
 
         if ((path != null) && (col == null || col.getStorage() == StorageKind.Sparse)) {
-            RefObject<RowBuffer> tempRef_Row =
-                new RefObject<RowBuffer>(this.Row);
-            scope.get().Find(tempRef_Row, path);
-            this.Row = tempRef_Row.get();
+            Reference<RowBuffer> tempReference_Row =
+                new Reference<RowBuffer>(this.Row);
+            scope.get().Find(tempReference_Row, path);
+            this.Row = tempReference_Row.get();
         }
 
         switch (type.LayoutCode) {
             case Null:
-                RefObject<RowOperationDispatcher> tempRef_this = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutNull, NullValue>Dispatch(tempRef_this, scope, col, type, NullValue.Default);
-                this = tempRef_this.get();
+                Reference<RowOperationDispatcher> tempReference_this = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutNull, NullValue>Dispatch(tempReference_this, scope, col, type, NullValue.Default);
+                this = tempReference_this.get();
                 break;
             case Boolean:
-                RefObject<RowOperationDispatcher> tempRef_this2 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutBoolean, Boolean>Dispatch(tempRef_this2, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this2 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutBoolean, Boolean>Dispatch(tempReference_this2, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this2.get();
+                this = tempReference_this2.get();
 
                 break;
             case Int8:
-                RefObject<RowOperationDispatcher> tempRef_this3 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutInt8, Byte>Dispatch(tempRef_this3, scope, col, type, value != null ?
+                Reference<RowOperationDispatcher> tempReference_this3 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutInt8, Byte>Dispatch(tempReference_this3, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this3.get();
+                this = tempReference_this3.get();
 
                 break;
             case Int16:
-                RefObject<RowOperationDispatcher> tempRef_this4 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutInt16, Short>Dispatch(tempRef_this4, scope, col, type, value != null ?
+                Reference<RowOperationDispatcher> tempReference_this4 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutInt16, Short>Dispatch(tempReference_this4, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this4.get();
+                this = tempReference_this4.get();
 
                 break;
             case Int32:
-                RefObject<RowOperationDispatcher> tempRef_this5 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutInt32, Integer>Dispatch(tempRef_this5, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this5 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutInt32, Integer>Dispatch(tempReference_this5, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this5.get();
+                this = tempReference_this5.get();
                 break;
             case Int64:
-                RefObject<RowOperationDispatcher> tempRef_this6 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutInt64, Long>Dispatch(tempRef_this6, scope, col, type, value != null ?
+                Reference<RowOperationDispatcher> tempReference_this6 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutInt64, Long>Dispatch(tempReference_this6, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this6.get();
+                this = tempReference_this6.get();
                 break;
             case UInt8:
-                RefObject<RowOperationDispatcher> tempRef_this7 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this7 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutUInt8, byte>(tempRef_this7, scope, col, type,
                 // (Nullable<byte>)value != null ? value : default);
-                this.dispatcher.<LayoutUInt8, Byte>Dispatch(tempRef_this7, scope, col, type, value != null ?
+                this.dispatcher.<LayoutUInt8, Byte>Dispatch(tempReference_this7, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this7.get();
+                this = tempReference_this7.get();
                 break;
             case UInt16:
-                RefObject<RowOperationDispatcher> tempRef_this8 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this8 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutUInt16, ushort>(tempRef_this8, scope, col, type,
                 // (Nullable<ushort>)value != null ? value : default);
-                this.dispatcher.<LayoutUInt16, Short>Dispatch(tempRef_this8, scope, col, type, value != null ?
+                this.dispatcher.<LayoutUInt16, Short>Dispatch(tempReference_this8, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this8.get();
+                this = tempReference_this8.get();
 
                 break;
             case UInt32:
-                RefObject<RowOperationDispatcher> tempRef_this9 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this9 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutUInt32, uint>(tempRef_this9, scope, col, type,
                 // (Nullable<uint>)value != null ? value : default);
-                this.dispatcher.<LayoutUInt32, Integer>Dispatch(tempRef_this9, scope, col, type,
+                this.dispatcher.<LayoutUInt32, Integer>Dispatch(tempReference_this9, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this9.get();
+                this = tempReference_this9.get();
                 break;
             case UInt64:
-                RefObject<RowOperationDispatcher> tempRef_this10 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this10 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutUInt64, ulong>(tempRef_this10, scope, col, type,
                 // (Nullable<ulong>)value != null ? value : default);
-                this.dispatcher.<LayoutUInt64, Long>Dispatch(tempRef_this10, scope, col, type, value != null ?
+                this.dispatcher.<LayoutUInt64, Long>Dispatch(tempReference_this10, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this10.get();
+                this = tempReference_this10.get();
 
                 break;
             case VarInt:
-                RefObject<RowOperationDispatcher> tempRef_this11 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutVarInt, Long>Dispatch(tempRef_this11, scope, col, type, value != null ?
+                Reference<RowOperationDispatcher> tempReference_this11 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutVarInt, Long>Dispatch(tempReference_this11, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this11.get();
+                this = tempReference_this11.get();
                 break;
             case VarUInt:
-                RefObject<RowOperationDispatcher> tempRef_this12 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this12 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutVarUInt, ulong>(tempRef_this12, scope, col, type,
                 // (Nullable<ulong>)value != null ? value : default);
-                this.dispatcher.<LayoutVarUInt, Long>Dispatch(tempRef_this12, scope, col, type, value != null ?
+                this.dispatcher.<LayoutVarUInt, Long>Dispatch(tempReference_this12, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this12.get();
+                this = tempReference_this12.get();
 
                 break;
             case Float32:
-                RefObject<RowOperationDispatcher> tempRef_this13 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutFloat32, Float>Dispatch(tempRef_this13, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this13 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutFloat32, Float>Dispatch(tempReference_this13, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this13.get();
+                this = tempReference_this13.get();
 
                 break;
             case Float64:
-                RefObject<RowOperationDispatcher> tempRef_this14 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutFloat64, Double>Dispatch(tempRef_this14, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this14 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutFloat64, Double>Dispatch(tempReference_this14, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this14.get();
+                this = tempReference_this14.get();
 
                 break;
             case Float128:
-                RefObject<RowOperationDispatcher> tempRef_this15 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutFloat128, Float128>Dispatch(tempRef_this15, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this15 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutFloat128, Float128>Dispatch(tempReference_this15, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this15.get();
+                this = tempReference_this15.get();
 
                 break;
             case Decimal:
-                RefObject<RowOperationDispatcher> tempRef_this16 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutDecimal, BigDecimal>Dispatch(tempRef_this16, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this16 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutDecimal, BigDecimal>Dispatch(tempReference_this16, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this16.get();
+                this = tempReference_this16.get();
 
                 break;
             case DateTime:
-                RefObject<RowOperationDispatcher> tempRef_this17 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutDateTime, LocalDateTime>Dispatch(tempRef_this17, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this17 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutDateTime, LocalDateTime>Dispatch(tempReference_this17, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this17.get();
+                this = tempReference_this17.get();
 
                 break;
             case UnixDateTime:
-                RefObject<RowOperationDispatcher> tempRef_this18 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutUnixDateTime, UnixDateTime>Dispatch(tempRef_this18, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this18 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutUnixDateTime, UnixDateTime>Dispatch(tempReference_this18, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this18.get();
+                this = tempReference_this18.get();
 
                 break;
             case Guid:
-                RefObject<RowOperationDispatcher> tempRef_this19 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutGuid, UUID>Dispatch(tempRef_this19, scope, col, type, value != null ?
+                Reference<RowOperationDispatcher> tempReference_this19 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutGuid, UUID>Dispatch(tempReference_this19, scope, col, type, value != null ?
                     value :
             default)
-                this = tempRef_this19.get();
+                this = tempReference_this19.get();
                 break;
             case MongoDbObjectId:
-                RefObject<RowOperationDispatcher> tempRef_this20 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutMongoDbObjectId, MongoDbObjectId>Dispatch(tempRef_this20, scope, col, type,
+                Reference<RowOperationDispatcher> tempReference_this20 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutMongoDbObjectId, MongoDbObjectId>Dispatch(tempReference_this20, scope, col, type,
                     value != null ? value :
             default)
-                this = tempRef_this20.get();
+                this = tempReference_this20.get();
 
                 break;
             case Utf8:
-                RefObject<RowOperationDispatcher> tempRef_this21 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.<LayoutUtf8, String>Dispatch(tempRef_this21, scope, col, type, (String)value);
-                this = tempRef_this21.get();
+                Reference<RowOperationDispatcher> tempReference_this21 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.<LayoutUtf8, String>Dispatch(tempReference_this21, scope, col, type, (String)value);
+                this = tempReference_this21.get();
 
                 break;
             case Binary:
-                RefObject<RowOperationDispatcher> tempRef_this22 = new RefObject<RowOperationDispatcher>(this);
+                Reference<RowOperationDispatcher> tempReference_this22 = new Reference<RowOperationDispatcher>(this);
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: this.dispatcher.Dispatch<LayoutBinary, byte[]>(ref this, ref scope, col, type,
                 // (byte[])value);
-                this.dispatcher.<LayoutBinary, byte[]>Dispatch(tempRef_this22, scope, col, type, (byte[])value);
-                this = tempRef_this22.get();
+                this.dispatcher.<LayoutBinary, byte[]>Dispatch(tempReference_this22, scope, col, type, (byte[])value);
+                this = tempReference_this22.get();
 
                 break;
             case ObjectScope:
             case ImmutableObjectScope:
-                RefObject<RowOperationDispatcher> tempRef_this23 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchObject(tempRef_this23, scope);
-                this = tempRef_this23.get();
+                Reference<RowOperationDispatcher> tempReference_this23 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchObject(tempReference_this23, scope);
+                this = tempReference_this23.get();
                 break;
             case TypedArrayScope:
             case ImmutableTypedArrayScope:
-                RefObject<RowOperationDispatcher> tempRef_this24 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchArray(tempRef_this24, scope, type, typeArgs.clone(), value);
-                this = tempRef_this24.get();
+                Reference<RowOperationDispatcher> tempReference_this24 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchArray(tempReference_this24, scope, type, typeArgs.clone(), value);
+                this = tempReference_this24.get();
                 break;
             case TypedSetScope:
             case ImmutableTypedSetScope:
-                RefObject<RowOperationDispatcher> tempRef_this25 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchSet(tempRef_this25, scope, type, typeArgs.clone(), value);
-                this = tempRef_this25.get();
+                Reference<RowOperationDispatcher> tempReference_this25 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchSet(tempReference_this25, scope, type, typeArgs.clone(), value);
+                this = tempReference_this25.get();
                 break;
             case TypedMapScope:
             case ImmutableTypedMapScope:
-                RefObject<RowOperationDispatcher> tempRef_this26 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchMap(tempRef_this26, scope, type, typeArgs.clone(), value);
-                this = tempRef_this26.get();
+                Reference<RowOperationDispatcher> tempReference_this26 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchMap(tempReference_this26, scope, type, typeArgs.clone(), value);
+                this = tempReference_this26.get();
                 break;
             case TupleScope:
             case ImmutableTupleScope:
@@ -386,20 +387,20 @@ public final class RowOperationDispatcher {
             case ImmutableTaggedScope:
             case Tagged2Scope:
             case ImmutableTagged2Scope:
-                RefObject<RowOperationDispatcher> tempRef_this27 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchTuple(tempRef_this27, scope, type, typeArgs.clone(), value);
-                this = tempRef_this27.get();
+                Reference<RowOperationDispatcher> tempReference_this27 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchTuple(tempReference_this27, scope, type, typeArgs.clone(), value);
+                this = tempReference_this27.get();
                 break;
             case NullableScope:
-                RefObject<RowOperationDispatcher> tempRef_this28 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchNullable(tempRef_this28, scope, type, typeArgs.clone(), value);
-                this = tempRef_this28.get();
+                Reference<RowOperationDispatcher> tempReference_this28 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchNullable(tempReference_this28, scope, type, typeArgs.clone(), value);
+                this = tempReference_this28.get();
                 break;
             case Schema:
             case ImmutableSchema:
-                RefObject<RowOperationDispatcher> tempRef_this29 = new RefObject<RowOperationDispatcher>(this);
-                this.dispatcher.DispatchUDT(tempRef_this29, scope, type, typeArgs.clone(), value);
-                this = tempRef_this29.get();
+                Reference<RowOperationDispatcher> tempReference_this29 = new Reference<RowOperationDispatcher>(this);
+                this.dispatcher.DispatchUDT(tempReference_this29, scope, type, typeArgs.clone(), value);
+                this = tempReference_this29.get();
                 break;
             default:
                 if (logger.)
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowReaderUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowReaderUnitTests.java
index 9147477..7c5471c 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowReaderUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowReaderUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.MemorySpanResizer;
@@ -42,9 +43,9 @@ public final class RowReaderUnitTests {
         this.resolver = new LayoutResolverNamespace(this.schema);
     }
 
-    public static void PrintReader(RefObject<RowReader> reader, int indent) {
+    public static void PrintReader(Reference<RowReader> reader, int indent) {
         String str;
-        OutObject<String> tempOut_str = new OutObject<String>();
+        Out<String> tempOut_str = new Out<String>();
         ResultAssert.IsSuccess(DiagnosticConverter.ReaderToString(reader, tempOut_str));
         str = tempOut_str.get();
         System.out.println(str);
@@ -182,10 +183,10 @@ public final class RowReaderUnitTests {
 
         RowReader reader = d.GetReader().clone();
         assert reader.getLength() == d.Row.getLength();
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
-        RowReaderUnitTests.PrintReader(tempRef_reader, 0);
-        reader = tempRef_reader.get();
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
+        RowReaderUnitTests.PrintReader(tempReference_reader, 0);
+        reader = tempReference_reader.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -199,59 +200,59 @@ public final class RowReaderUnitTests {
             "Mixed")).SchemaId);
         row.InitLayout(HybridRowVersion.V1, layout, this.resolver);
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempRef_row, 2, RowReaderUnitTests.WriteNestedDocument));
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RowReader rowReader = new RowReader(tempRef_row2);
-        row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempReference_row, 2, RowReaderUnitTests.WriteNestedDocument));
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        RowReader rowReader = new RowReader(tempReference_row2);
+        row = tempReference_row2.get();
 
-        RefObject<RowReader> tempRef_rowReader =
-            new RefObject<RowReader>(rowReader);
-        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentDelegate(tempRef_rowReader, 0));
-        rowReader = tempRef_rowReader.get();
+        Reference<RowReader> tempReference_rowReader =
+            new Reference<RowReader>(rowReader);
+        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentDelegate(tempReference_rowReader, 0));
+        rowReader = tempReference_rowReader.get();
 
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        rowReader = new RowReader(tempRef_row3);
-        row = tempRef_row3.get();
-        RefObject<RowReader> tempRef_rowReader2 =
-            new RefObject<RowReader>(rowReader);
-        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempRef_rowReader2, 0));
-        rowReader = tempRef_rowReader2.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        rowReader = new RowReader(tempReference_row3);
+        row = tempReference_row3.get();
+        Reference<RowReader> tempReference_rowReader2 =
+            new Reference<RowReader>(rowReader);
+        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempReference_rowReader2, 0));
+        rowReader = tempReference_rowReader2.get();
 
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
-        rowReader = new RowReader(tempRef_row4);
-        row = tempRef_row4.get();
-        RefObject<RowReader> tempRef_rowReader3 =
-            new RefObject<RowReader>(rowReader);
-        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegateWithSkipScope(tempRef_rowReader3, 0));
-        rowReader = tempRef_rowReader3.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
+        rowReader = new RowReader(tempReference_row4);
+        row = tempReference_row4.get();
+        Reference<RowReader> tempReference_rowReader3 =
+            new Reference<RowReader>(rowReader);
+        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegateWithSkipScope(tempReference_rowReader3, 0));
+        rowReader = tempReference_rowReader3.get();
 
         // SkipScope not okay after advancing parent
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
-        rowReader = new RowReader(tempRef_row5);
-        row = tempRef_row5.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
+        rowReader = new RowReader(tempReference_row5);
+        row = tempReference_row5.get();
         assert rowReader.Read();
         assert rowReader.getType().LayoutCode == LayoutCode.ObjectScope;
         RowReader nestedScope = rowReader.ReadScope().clone();
-        RefObject<RowReader> tempRef_nestedScope =
-            new RefObject<RowReader>(nestedScope);
-        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentDelegate(tempRef_nestedScope, 0));
-        nestedScope = tempRef_nestedScope.get();
+        Reference<RowReader> tempReference_nestedScope =
+            new Reference<RowReader>(nestedScope);
+        ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentDelegate(tempReference_nestedScope, 0));
+        nestedScope = tempReference_nestedScope.get();
         assert rowReader.Read();
-        RefObject<RowReader> tempRef_nestedScope2 =
-            new RefObject<RowReader>(nestedScope);
-        Result result = rowReader.SkipScope(tempRef_nestedScope2);
-        nestedScope = tempRef_nestedScope2.get();
+        Reference<RowReader> tempReference_nestedScope2 =
+            new Reference<RowReader>(nestedScope);
+        Result result = rowReader.SkipScope(tempReference_nestedScope2);
+        nestedScope = tempReference_nestedScope2.get();
         assert Result.Success != result;
     }
 
-    private static Result ReadNestedDocumentDelegate(RefObject<RowReader> reader, int context) {
+    private static Result ReadNestedDocumentDelegate(Reference<RowReader> reader, int context) {
         while (reader.get().Read()) {
             switch (reader.get().getType().LayoutCode) {
                 case TupleScope: {
@@ -269,24 +270,24 @@ public final class RowReaderUnitTests {
         return Result.Success;
     }
 
-    private static Result ReadNestedDocumentNonDelegate(RefObject<RowReader> reader, int context) {
+    private static Result ReadNestedDocumentNonDelegate(Reference<RowReader> reader, int context) {
         while (reader.get().Read()) {
             switch (reader.get().getType().LayoutCode) {
                 case TupleScope: {
                     RowReader nested = reader.get().ReadScope().clone();
-                    RefObject<RowReader> tempRef_nested =
-                        new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadTuplePartial(tempRef_nested, 0));
-                    nested = tempRef_nested.get();
+                    Reference<RowReader> tempReference_nested =
+                        new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadTuplePartial(tempReference_nested, 0));
+                    nested = tempReference_nested.get();
                     break;
                 }
 
                 case ObjectScope: {
                     RowReader nested = reader.get().ReadScope().clone();
-                    RefObject<RowReader> tempRef_nested2 =
-                        new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempRef_nested2, 0));
-                    nested = tempRef_nested2.get();
+                    Reference<RowReader> tempReference_nested2 =
+                        new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempReference_nested2, 0));
+                    nested = tempReference_nested2.get();
                     ResultAssert.IsSuccess(reader.get().ReadScope(0, RowReaderUnitTests.ReadNestedDocumentDelegate));
                     break;
                 }
@@ -296,33 +297,33 @@ public final class RowReaderUnitTests {
         return Result.Success;
     }
 
-    private static Result ReadNestedDocumentNonDelegateWithSkipScope(RefObject<RowReader> reader,
+    private static Result ReadNestedDocumentNonDelegateWithSkipScope(Reference<RowReader> reader,
                                                                      int context) {
         while (reader.get().Read()) {
             switch (reader.get().getType().LayoutCode) {
                 case TupleScope: {
                     RowReader nested = reader.get().ReadScope().clone();
-                    RefObject<RowReader> tempRef_nested =
-                        new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadTuplePartial(tempRef_nested, 0));
-                    nested = tempRef_nested.get();
-                    RefObject<RowReader> tempRef_nested2 =
-                        new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(reader.get().SkipScope(tempRef_nested2));
-                    nested = tempRef_nested2.get();
+                    Reference<RowReader> tempReference_nested =
+                        new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadTuplePartial(tempReference_nested, 0));
+                    nested = tempReference_nested.get();
+                    Reference<RowReader> tempReference_nested2 =
+                        new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(reader.get().SkipScope(tempReference_nested2));
+                    nested = tempReference_nested2.get();
                     break;
                 }
 
                 case ObjectScope: {
                     RowReader nested = reader.get().ReadScope().clone();
-                    RefObject<RowReader> tempRef_nested3 =
-                        new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempRef_nested3, 0));
-                    nested = tempRef_nested3.get();
+                    Reference<RowReader> tempReference_nested3 =
+                        new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(RowReaderUnitTests.ReadNestedDocumentNonDelegate(tempReference_nested3, 0));
+                    nested = tempReference_nested3.get();
                     ResultAssert.IsSuccess(reader.get().ReadScope(0, RowReaderUnitTests.ReadNestedDocumentDelegate));
-                    RefObject<RowReader> tempRef_nested4 = new RefObject<RowReader>(nested);
-                    ResultAssert.IsSuccess(reader.get().SkipScope(tempRef_nested4));
-                    nested = tempRef_nested4.get();
+                    Reference<RowReader> tempReference_nested4 = new Reference<RowReader>(nested);
+                    ResultAssert.IsSuccess(reader.get().SkipScope(tempReference_nested4));
+                    nested = tempReference_nested4.get();
                     break;
                 }
             }
@@ -331,14 +332,14 @@ public final class RowReaderUnitTests {
         return Result.Success;
     }
 
-    private static Result ReadTuplePartial(RefObject<RowReader> reader, int unused) {
+    private static Result ReadTuplePartial(Reference<RowReader> reader, int unused) {
         // Read only part of our tuple
         assert reader.get().Read();
         assert reader.get().Read();
         return Result.Success;
     }
 
-    private static Result WriteNestedDocument(RefObject<RowWriter> writer, TypeArgument typeArgument,
+    private static Result WriteNestedDocument(Reference<RowWriter> writer, TypeArgument typeArgument,
                                               int level) {
         TypeArgument tupleArgument = new TypeArgument(LayoutType.Tuple, new TypeArgumentList(new TypeArgument[]
             {
@@ -384,12 +385,12 @@ public final class RowReaderUnitTests {
             this.Y = y;
         }
 
-        public void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> scope) {
+        public void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> scope) {
             dispatcher.get().LayoutCodeSwitch(scope, "x", value:this.X)
             dispatcher.get().LayoutCodeSwitch(scope, "y", value:this.Y)
         }
 
-        public Result Write(RefObject<RowWriter> writer, TypeArgument typeArg) {
+        public Result Write(Reference<RowWriter> writer, TypeArgument typeArg) {
             Result result = writer.get().WriteInt32("x", this.X);
             if (result != Result.Success) {
                 return result;
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowWriterUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowWriterUnitTests.java
index e19565b..81e77ce 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowWriterUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/RowWriterUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Float128;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.NullValue;
@@ -54,12 +55,12 @@ public final class RowWriterUnitTests {
         row.InitLayout(HybridRowVersion.V1, layout, this.resolver);
 
         int writerLength = 0;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
-        ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempRef_row, null, (ref RowWriter writer,
-                                                                         TypeArgument rootTypeArg, Object ignored) ->
+        ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempReference_row, null, (ref RowWriter writer,
+                                                                               TypeArgument rootTypeArg, Object ignored) ->
         {
             ResultAssert.IsSuccess(writer.WriteNull("null"));
             ResultAssert.IsSuccess(writer.WriteBool("bool", true));
@@ -127,8 +128,8 @@ public final class RowWriterUnitTests {
                 new ReadOnlySequence<Byte>(new byte[] { (byte)0, (byte)1, (byte)2 })));
 
             LayoutColumn col;
-            OutObject<LayoutColumn> tempOut_col =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col =
+                new Out<LayoutColumn>();
             assert layout.TryFind("array_t<int8>", tempOut_col);
             col = tempOut_col.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new byte[] { -86, -87,
@@ -141,8 +142,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col2 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col2 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("array_t<array_t<float32>>", tempOut_col2);
             col = tempOut_col2.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new float[][]
@@ -166,8 +167,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col3 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col3 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("array_t<utf8>", tempOut_col3);
             col = tempOut_col3.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new String[] { "abc",
@@ -180,8 +181,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col4 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col4 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("tuple<varint,int64>", tempOut_col4);
             col = tempOut_col4.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(),
@@ -194,8 +195,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col5 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col5 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("tuple<null,tuple<int8,int8>>", tempOut_col5);
             col = tempOut_col5.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(),
@@ -216,8 +217,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col6 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col6 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("tuple<bool,udt>", tempOut_col6);
             col = tempOut_col6.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), Tuple.Create(false,
@@ -225,23 +226,23 @@ public final class RowWriterUnitTests {
                 RowReaderUnitTests.Point> values) ->
             {
                 ResultAssert.IsSuccess(writer2.WriteBool(null, values.Item1));
-                RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer3 =
-                    new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer3);
+                Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer3 =
+                    new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer3);
                 ResultAssert.IsSuccess(writer2.WriteScope(null, typeArg.getTypeArgs().get(1).clone(), values.Item2,
-                    (ref RowWriter writer3, TypeArgument typeArg2, IRowSerializable values2) -> values2.Write(tempRef_writer3, typeArg2.clone())));
-                writer3 = tempRef_writer3.get();
+                    (ref RowWriter writer3, TypeArgument typeArg2, IRowSerializable values2) -> values2.Write(tempReference_writer3, typeArg2.clone())));
+                writer3 = tempReference_writer3.get();
 
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col7 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col7 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("nullable<int32,int64>", tempOut_col7);
             col = tempOut_col7.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), Tuple.Create(null,
                 (Long)123L), (ref RowWriter writer2, TypeArgument typeArg, Tuple<Integer, Long> values) ->
             {
-                RowWriter.WriterFunc<Integer> f0 = (RefObject<RowWriter> writer, TypeArgument typeArg,
+                RowWriter.WriterFunc<Integer> f0 = (Reference<RowWriter> writer, TypeArgument typeArg,
                                                     Integer context) -> null.invoke(writer, typeArg.clone(), context);
                 if (values.Item1 != null) {
                     f0 = (ref RowWriter writer3, TypeArgument typeArg2, Integer value) -> writer3.WriteInt32(null,
@@ -251,7 +252,7 @@ public final class RowWriterUnitTests {
                 ResultAssert.IsSuccess(writer2.WriteScope(null, typeArg.getTypeArgs().get(0).clone(), values.Item1,
                     f0));
 
-                RowWriter.WriterFunc<Long> f1 = (RefObject<RowWriter> writer, TypeArgument typeArg,
+                RowWriter.WriterFunc<Long> f1 = (Reference<RowWriter> writer, TypeArgument typeArg,
                                                  Long context) -> null.invoke(writer, typeArg.clone(), context);
                 if (values.Item2 != null) {
                     f1 = (ref RowWriter writer3, TypeArgument typeArg2, Long value) -> writer3.WriteInt64(null,
@@ -263,8 +264,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col8 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col8 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("tagged<utf8>", tempOut_col8);
             col = tempOut_col8.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), Tuple.Create((byte)3,
@@ -275,8 +276,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col9 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col9 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("tagged<bool,utf8>", tempOut_col9);
             col = tempOut_col9.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), Tuple.Create((byte)5,
@@ -288,8 +289,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col10 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col10 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("set_t<utf8>", tempOut_col10);
             col = tempOut_col10.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new String[] { "abc",
@@ -302,8 +303,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col11 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col11 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("set_t<array_t<int8>>", tempOut_col11);
             col = tempOut_col11.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new byte[][]
@@ -328,8 +329,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col12 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col12 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("set_t<set_t<int32>>", tempOut_col12);
             col = tempOut_col12.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new int[][]
@@ -354,8 +355,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col13 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col13 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("set_t<udt>", tempOut_col13);
             col = tempOut_col13.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(),
@@ -367,18 +368,18 @@ public final class RowWriterUnitTests {
                 }, (ref RowWriter writer2, TypeArgument typeArg, RowReaderUnitTests.Point[] values) ->
             {
                 for (RowReaderUnitTests.Point value : values) {
-                    RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer3 =
-                        new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer3);
+                    Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer3 =
+                        new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer3);
                     ResultAssert.IsSuccess(writer2.WriteScope(null, typeArg.getTypeArgs().get(0).clone(), value,
-                        (ref RowWriter writer3, TypeArgument typeArg2, IRowSerializable values2) -> values2.Write(tempRef_writer3, typeArg2.clone())));
-                    writer3 = tempRef_writer3.get();
+                        (ref RowWriter writer3, TypeArgument typeArg2, IRowSerializable values2) -> values2.Write(tempReference_writer3, typeArg2.clone())));
+                    writer3 = tempReference_writer3.get();
                 }
 
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col14 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col14 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("map_t<utf8,utf8>", tempOut_col14);
             col = tempOut_col14.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new System.Tuple<T1,
@@ -400,8 +401,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col15 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col15 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("map_t<int8,array_t<int8>>", tempOut_col15);
             col = tempOut_col15.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new System.Tuple<T1,
@@ -432,8 +433,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col16 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col16 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("map_t<int16,map_t<int32,int32>>", tempOut_col16);
             col = tempOut_col16.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new System.Tuple<T1,
@@ -472,8 +473,8 @@ public final class RowWriterUnitTests {
                 return Result.Success;
             }));
 
-            OutObject<LayoutColumn> tempOut_col17 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_col17 =
+                new Out<LayoutColumn>();
             assert layout.TryFind("map_t<float64,udt>", tempOut_col17);
             col = tempOut_col17.get();
             ResultAssert.IsSuccess(writer.WriteScope(col.getPath(), col.getTypeArg().clone(), new System.Tuple<T1, T2>[] { Tuple.Create(1.0, new RowReaderUnitTests.Point(1, 2)), Tuple.Create(2.0, new RowReaderUnitTests.Point(3, 4)), Tuple.Create(3.0, new RowReaderUnitTests.Point(5, 6)) }, (ref RowWriter writer2, TypeArgument typeArg, Tuple<Double, RowReaderUnitTests.Point>[] values) ->
@@ -482,9 +483,9 @@ public final class RowWriterUnitTests {
                     ResultAssert.IsSuccess(writer2.WriteScope(null, new TypeArgument(LayoutType.TypedTuple, typeArg.getTypeArgs().clone()), value, (ref RowWriter writer3, TypeArgument typeArg2, Tuple<Double, RowReaderUnitTests.Point> values2) ->
                     {
                         ResultAssert.IsSuccess(writer3.WriteFloat64(null, values2.Item1));
-                        RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempRef_writer4 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer4);
-                        ResultAssert.IsSuccess(writer3.WriteScope(null, typeArg2.getTypeArgs().get(1).clone(), values2.Item2, (ref RowWriter writer4, TypeArgument typeArg3, IRowSerializable values3) -> values3.Write(tempRef_writer4, typeArg3.clone())));
-                        writer4 = tempRef_writer4.get();
+                        Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter> tempReference_writer4 = new Reference<com.azure.data.cosmos.serialization.hybridrow.io.RowWriter>(writer4);
+                        ResultAssert.IsSuccess(writer3.WriteScope(null, typeArg2.getTypeArgs().get(1).clone(), values2.Item2, (ref RowWriter writer4, TypeArgument typeArg3, IRowSerializable values3) -> values3.Write(tempReference_writer4, typeArg3.clone())));
+                        writer4 = tempReference_writer4.get();
 
                         return Result.Success;
                     }));
@@ -497,14 +498,14 @@ public final class RowWriterUnitTests {
             writerLength = writer.Length;
             return Result.Success;
         }));
-        row = tempRef_row.get();
+        row = tempReference_row.get();
 
-        RefObject<RowBuffer> tempRef_row2 = new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row2);
-        row = tempRef_row2.get();
+        Reference<RowBuffer> tempReference_row2 = new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row2);
+        row = tempReference_row2.get();
         assert reader.getLength() == writerLength;
-        RefObject<RowReader> tempRef_reader = new RefObject<RowReader>(reader);
-        RowReaderUnitTests.PrintReader(tempRef_reader, 0);
-        reader = tempRef_reader.get();
+        Reference<RowReader> tempReference_reader = new Reference<RowReader>(reader);
+        RowReaderUnitTests.PrintReader(tempReference_reader, 0);
+        reader = tempReference_reader.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/SerializerUnitTest.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/SerializerUnitTest.java
index 2c6f1aa..58c6a11 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/SerializerUnitTest.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/SerializerUnitTest.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -67,39 +68,39 @@ public final class SerializerUnitTest {
         // Write the request by serializing it to a row.
         RowBuffer row = new RowBuffer(SerializerUnitTest.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        Result r = RowWriter.WriteBuffer(tempRef_row, request, BatchRequestSerializer.Write);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Result r = RowWriter.WriteBuffer(tempReference_row, request, BatchRequestSerializer.Write);
+        row = tempReference_row.get();
         assert Result.Success == r;
         System.out.printf("Length of serialized row: %1$s" + "\r\n", row.getLength());
 
         // Read the row back again.
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RowReader reader = new RowReader(tempRef_row2);
-        row = tempRef_row2.get();
-        RefObject<RowReader> tempRef_reader =
-            new RefObject<RowReader>(reader);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        RowReader reader = new RowReader(tempReference_row2);
+        row = tempReference_row2.get();
+        Reference<RowReader> tempReference_reader =
+            new Reference<RowReader>(reader);
         BatchRequest _;
-        OutObject<BatchRequest> tempOut__ = new OutObject<BatchRequest>();
-        r = BatchRequestSerializer.Read(tempRef_reader, tempOut__);
+        Out<BatchRequest> tempOut__ = new Out<BatchRequest>();
+        r = BatchRequestSerializer.Read(tempReference_reader, tempOut__);
         _ = tempOut__.get();
-        reader = tempRef_reader.get();
+        reader = tempReference_reader.get();
         assert Result.Success == r;
 
         // Dump the materialized request to the console.
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        reader = new RowReader(tempRef_row3);
-        row = tempRef_row3.get();
-        RefObject<RowReader> tempRef_reader2 =
-            new RefObject<RowReader>(reader);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        reader = new RowReader(tempReference_row3);
+        row = tempReference_row3.get();
+        Reference<RowReader> tempReference_reader2 =
+            new Reference<RowReader>(reader);
         String dumpStr;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        r = DiagnosticConverter.ReaderToString(tempRef_reader2, out dumpStr);
-        reader = tempRef_reader2.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        r = DiagnosticConverter.ReaderToString(tempReference_reader2, out dumpStr);
+        reader = tempReference_reader2.get();
         assert Result.Success == r;
         System.out.println(dumpStr);
     }
@@ -136,14 +137,14 @@ public final class SerializerUnitTest {
         public static final TypeArgument TypeArg = new TypeArgument(LayoutType.UDT,
             new TypeArgumentList(new SchemaId(2)));
 
-        public static Result Read(RefObject<RowReader> reader, OutObject<BatchOperation> operation) {
+        public static Result Read(Reference<RowReader> reader, Out<BatchOperation> operation) {
             BatchOperation retval = new BatchOperation();
             operation.set(null);
             while (reader.get().Read()) {
                 Result r;
                 switch (reader.get().getPath()) {
                     case "operationType":
-                        OutObject<Integer> tempOut_OperationType = new OutObject<Integer>();
+                        Out<Integer> tempOut_OperationType = new Out<Integer>();
                         r = reader.get().ReadInt32(tempOut_OperationType);
                         retval.OperationType = tempOut_OperationType.get();
                         if (r != Result.Success) {
@@ -152,21 +153,21 @@ public final class SerializerUnitTest {
 
                         break;
                     case "headers":
-                        RefObject<RowReader> tempRef_child = new RefObject<RowReader>(child);
-                        OutObject<BatchRequestHeaders> tempOut_Headers = new OutObject<BatchRequestHeaders>();
+                        Reference<RowReader> tempReference_child = new Reference<RowReader>(child);
+                        Out<BatchRequestHeaders> tempOut_Headers = new Out<BatchRequestHeaders>();
                         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword
                         // - these are not converted by C# to Java Converter:
                         r = reader.get().ReadScope(retval,
-                            (ref RowReader child, BatchOperation parent) -> BatchRequestHeadersSerializer.Read(tempRef_child, tempOut_Headers));
+                            (ref RowReader child, BatchOperation parent) -> BatchRequestHeadersSerializer.Read(tempReference_child, tempOut_Headers));
                         parent.Headers = tempOut_Headers.get();
-                        child = tempRef_child.get();
+                        child = tempReference_child.get();
                         if (r != Result.Success) {
                             return r;
                         }
 
                         break;
                     case "resourceType":
-                        OutObject<Integer> tempOut_ResourceType = new OutObject<Integer>();
+                        Out<Integer> tempOut_ResourceType = new Out<Integer>();
                         r = reader.get().ReadInt32(tempOut_ResourceType);
                         retval.ResourceType = tempOut_ResourceType.get();
                         if (r != Result.Success) {
@@ -175,7 +176,7 @@ public final class SerializerUnitTest {
 
                         break;
                     case "resourcePath":
-                        OutObject<String> tempOut_ResourcePath = new OutObject<String>();
+                        Out<String> tempOut_ResourcePath = new Out<String>();
                         r = reader.get().ReadString(tempOut_ResourcePath);
                         retval.ResourcePath = tempOut_ResourcePath.get();
                         if (r != Result.Success) {
@@ -184,7 +185,7 @@ public final class SerializerUnitTest {
 
                         break;
                     case "resourceBody":
-                        OutObject<Byte> tempOut_ResourceBody = new OutObject<Byte>();
+                        Out<Byte> tempOut_ResourceBody = new Out<Byte>();
                         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                         //ORIGINAL LINE: r = reader.ReadBinary(out retval.ResourceBody);
                         r = reader.get().ReadBinary(tempOut_ResourceBody);
@@ -201,7 +202,7 @@ public final class SerializerUnitTest {
             return Result.Success;
         }
 
-        public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg,
+        public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg,
                                    BatchOperation operation) {
             Result r = writer.get().WriteInt32("operationType", operation.OperationType);
             if (r != Result.Success) {
@@ -241,14 +242,14 @@ public final class SerializerUnitTest {
         public static final TypeArgument TypeArg = new TypeArgument(LayoutType.UDT,
             new TypeArgumentList(new SchemaId(1)));
 
-        public static Result Read(RefObject<RowReader> reader,
-                                  OutObject<BatchRequestHeaders> header) {
+        public static Result Read(Reference<RowReader> reader,
+                                  Out<BatchRequestHeaders> header) {
             BatchRequestHeaders retval = new BatchRequestHeaders();
             header.set(null);
             while (reader.get().Read()) {
                 switch (reader.get().getPath()) {
                     case "sampleRequestHeader":
-                        OutObject<Long> tempOut_SampleRequestHeader = new OutObject<Long>();
+                        Out<Long> tempOut_SampleRequestHeader = new Out<Long>();
                         Result r = reader.get().ReadInt64(tempOut_SampleRequestHeader);
                         retval.SampleRequestHeader = tempOut_SampleRequestHeader.get();
                         if (r != Result.Success) {
@@ -263,7 +264,7 @@ public final class SerializerUnitTest {
             return Result.Success;
         }
 
-        public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg,
+        public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg,
                                    BatchRequestHeaders header) {
             Result r = writer.get().WriteInt64("sampleRequestHeader", header.SampleRequestHeader);
             return r;
@@ -273,12 +274,12 @@ public final class SerializerUnitTest {
     public static class BatchRequestSerializer {
         public static final TypeArgument OperationsTypeArg = new TypeArgument(LayoutType.TypedArray, new TypeArgumentList(new TypeArgument[] { BatchOperationSerializer.TypeArg }));
 
-        public static Result Read(RefObject<RowReader> reader, OutObject<BatchRequest> request) {
+        public static Result Read(Reference<RowReader> reader, Out<BatchRequest> request) {
             assert reader.get().Read();
             checkState(reader.get().getPath().equals("operations"));
 
             java.util.ArrayList<BatchOperation> operations;
-            OutObject<ArrayList<TItem>> tempOut_operations = new OutObject<ArrayList<TItem>>();
+            Out<ArrayList<TItem>> tempOut_operations = new Out<ArrayList<TItem>>();
             Result r = RowReaderExtensions.ReadList(reader.get().clone(), BatchOperationSerializer.Read, tempOut_operations);
             operations = tempOut_operations.get();
             if (r != Result.Success) {
@@ -292,7 +293,7 @@ public final class SerializerUnitTest {
             return Result.Success;
         }
 
-        public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg, BatchRequest request) {
+        public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg, BatchRequest request) {
             // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not converted by C# to Java Converter:
             return writer.get().WriteScope("operations", BatchRequestSerializer.OperationsTypeArg, request.Operations, (ref RowWriter writer2, TypeArgument typeArg2, ArrayList<BatchOperation> operations) ->
             {
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TaggedUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TaggedUnitTests.java
index 63bb36f..cb05446 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TaggedUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TaggedUnitTests.java
@@ -4,7 +4,8 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -35,26 +36,26 @@ public final class TaggedUnitTests {
         //ORIGINAL LINE: c1.Tag2 = ((byte)2, 28, 1974L);
         c1.Tag2 = ((byte)2, 28, 1974L)
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteTaggedApi(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteTaggedApi(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        TaggedApi c2 = this.ReadTaggedApi(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        TaggedApi c2 = this.ReadTaggedApi(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert c1 == c2;
     }
 
@@ -68,31 +69,31 @@ public final class TaggedUnitTests {
             "TaggedApi")).SchemaId);
     }
 
-    private TaggedApi ReadTaggedApi(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private TaggedApi ReadTaggedApi(Reference<RowBuffer> row, Reference<RowCursor> root) {
         TaggedApi pc = new TaggedApi();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("tag1", out c);
         assert c.Type.Immutable;
         RowCursor tag1Scope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tag1Scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutIndexedScope>TypeAs().ReadScope(row, ref tag1Scope, out tag1Scope) == Result.Success) {
             assert tag1Scope.Immutable;
             assert tag1Scope.MoveNext(row);
             byte apiCode;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: ResultAssert.IsSuccess(c.TypeArgs[0].Type.TypeAs<LayoutUInt8>().ReadSparse(ref row, ref
@@ -102,36 +103,36 @@ public final class TaggedUnitTests {
             assert tag1Scope.MoveNext(row);
             String str;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref tag1Scope, out str));
             pc.Tag1 = (apiCode, str)
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("tag2", out c);
         assert !c.Type.Immutable;
         RowCursor tag2Scope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tag2Scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutIndexedScope>TypeAs().ReadScope(row, ref tag2Scope, out tag2Scope) == Result.Success) {
             assert !tag2Scope.Immutable;
             assert tag2Scope.MoveNext(row);
             byte apiCode;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: ResultAssert.IsSuccess(c.TypeArgs[0].Type.TypeAs<LayoutUInt8>().ReadSparse(ref row, ref
@@ -141,19 +142,19 @@ public final class TaggedUnitTests {
             assert tag2Scope.MoveNext(row);
             int val1;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt32>TypeAs().ReadSparse(row, ref tag2Scope, out val1));
             assert tag2Scope.MoveNext(row);
             long val2;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[2].Type.<LayoutInt64>TypeAs().ReadSparse(row, ref tag2Scope, out val2));
             pc.Tag2 = (apiCode, val1, val2)
@@ -162,52 +163,52 @@ public final class TaggedUnitTests {
         return pc;
     }
 
-    private void WriteTaggedApi(RefObject<RowBuffer> row, RefObject<RowCursor> root, TaggedApi pc) {
+    private void WriteTaggedApi(Reference<RowBuffer> row, Reference<RowCursor> root, TaggedApi pc) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("tag1", out c);
         RowCursor tag1Scope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tag1Scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(row, ref tag1Scope, c.TypeArgs,
             out tag1Scope));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUInt8>TypeAs().WriteSparse(row, ref tag1Scope, pc.Tag1.Item1));
         assert tag1Scope.MoveNext(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref tag1Scope, pc.Tag1.Item2));
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("tag2", out c);
         RowCursor tag2Scope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tag2Scope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(row, ref tag2Scope, c.TypeArgs,
             out tag2Scope));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUInt8>TypeAs().WriteSparse(row, ref tag2Scope, pc.Tag2.Item1));
         assert tag2Scope.MoveNext(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt32>TypeAs().WriteSparse(row, ref tag2Scope, pc.Tag2.Item2));
         assert tag2Scope.MoveNext(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         ResultAssert.IsSuccess(c.TypeArgs[2].Type.<LayoutInt64>TypeAs().WriteSparse(row, ref tag2Scope, pc.Tag2.Item3));
     }
 
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TupleUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TupleUnitTests.java
index 8ef5c42..fb650ba 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TupleUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TupleUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -43,26 +44,26 @@ public final class TupleUnitTests {
         tempVar.Lng = 40L;
         c1.Coord = Tuple.Create("units", tempVar);
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        PerfCounter c2 = this.ReadCounter(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        PerfCounter c2 = this.ReadCounter(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert c1 == c2;
     }
 
@@ -73,26 +74,26 @@ public final class TupleUnitTests {
         row.InitLayout(HybridRowVersion.V1, this.countersLayout, this.countersResolver);
 
         PerfCounter c1 = this.counterExample;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        PerfCounter c2 = this.ReadCounter(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        PerfCounter c2 = this.ReadCounter(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert c1 == c2;
     }
 
@@ -106,26 +107,26 @@ public final class TupleUnitTests {
         c1.Name = "RowInserts";
         c1.MinMaxValue = Tuple.Create("units", Tuple.Create(12L, 542L, 12046L));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        PerfCounter c2 = this.ReadCounter(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        PerfCounter c2 = this.ReadCounter(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert c1 == c2;
     }
 
@@ -139,53 +140,53 @@ public final class TupleUnitTests {
 
         LayoutColumn col;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert layout.TryFind("history", out col);
         StringToken historyToken;
-        OutObject<StringToken> tempOut_historyToken =
-            new OutObject<StringToken>();
+        Out<StringToken> tempOut_historyToken =
+            new Out<StringToken>();
         assert layout.getTokenizer().TryFindToken(col.Path, tempOut_historyToken);
         historyToken = tempOut_historyToken.get();
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor history;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row, out history).Find(tempRef_row2, historyToken);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row, out history).Find(tempReference_row2, historyToken);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
         int ctx = 1; // ignored
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_history =
-            new RefObject<RowCursor>(history);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_history =
+            new Reference<RowCursor>(history);
         // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not
         // converted by C# to Java Converter:
-        ResultAssert.IsSuccess(LayoutType.TypedArray.WriteScope(tempRef_row3, tempRef_history, col.TypeArgs, ctx,
+        ResultAssert.IsSuccess(LayoutType.TypedArray.WriteScope(tempReference_row3, tempReference_history, col.TypeArgs, ctx,
             (ref RowBuffer row2, ref RowCursor arrCur, int ctx2) ->
         {
             for (int i = 0; i < 5; i++) {
-                RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row2 =
-                    new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row2);
-                RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_arrCur =
-                    new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(arrCur);
-                ResultAssert.IsSuccess(LayoutType.UDT.WriteScope(tempRef_row2, tempRef_arrCur,
+                Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row2 =
+                    new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row2);
+                Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_arrCur =
+                    new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(arrCur);
+                ResultAssert.IsSuccess(LayoutType.UDT.WriteScope(tempReference_row2, tempReference_arrCur,
                     arrCur.ScopeTypeArgs[0].TypeArgs, i, (ref RowBuffer row3, ref RowCursor udtCur, int ctx3) ->
                 {
                     LayoutColumn col3;
                     assert udtCur.Layout.TryFind("minmeanmax", out col3);
-                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row3 =
-                        new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row3);
-                    RefObject<ref RowBuffer>tempRef_row32 = new RefObject<ref RowBuffer > (row3);
-                    ResultAssert.IsSuccess(LayoutType.TypedTuple.WriteScope(tempRef_row3, udtCur.Find(tempRef_row32,
+                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row3 =
+                        new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row3);
+                    Reference<ref RowBuffer>tempRef_row32 = new Reference<ref RowBuffer > (row3);
+                    ResultAssert.IsSuccess(LayoutType.TypedTuple.WriteScope(tempReference_row3, udtCur.Find(tempRef_row32,
                         col3.Path), col3.TypeArgs, ctx3, (ref RowBuffer row4, ref RowCursor tupCur, int ctx4) ->
                     {
                         if (ctx4 > 0) {
-                            RefObject<ref RowBuffer>tempRef_row4 = new RefObject<ref
+                            Reference<ref RowBuffer>tempRef_row4 = new Reference<ref
                             RowBuffer > (row4);
-                            RefObject<ref RowCursor>tempRef_tupCur = new RefObject<ref
+                            Reference<ref RowCursor>tempRef_tupCur = new Reference<ref
                             RowCursor > (tupCur);
                             ResultAssert.IsSuccess(LayoutType.Utf8.WriteSparse(tempRef_row4, tempRef_tupCur, "abc"));
                             tupCur = tempRef_tupCur.argValue;
@@ -193,76 +194,77 @@ public final class TupleUnitTests {
                         }
 
                         if (ctx4 > 1) {
-                            RefObject<ref RowBuffer>tempRef_row42 = new RefObject<ref
+                            Reference<ref RowBuffer>tempRef_row42 = new Reference<ref
                             RowBuffer > (row4);
                             assert tupCur.MoveNext(tempRef_row42);
                             row4 = tempRef_row42.argValue;
-                            RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row43 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row4);
-                            RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_tupCur2 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur);
-                            ResultAssert.IsSuccess(LayoutType.TypedTuple.WriteScope(tempRef_row43, tempRef_tupCur2,
+                            Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row43 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row4);
+                            Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_tupCur2 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur);
+                            ResultAssert.IsSuccess(LayoutType.TypedTuple.WriteScope(tempReference_row43,
+                                tempReference_tupCur2,
                                 tupCur.ScopeTypeArgs[1].TypeArgs, ctx4, (ref RowBuffer row5, ref RowCursor tupCur2,
                                                                          int ctx5) ->
                             {
                                 if (ctx5 > 1) {
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row5 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_tupCur2 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
-                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempRef_row5, tempRef_tupCur2
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row5 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_tupCur2 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
+                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempReference_row5, tempReference_tupCur2
                                         , ctx5));
-                                    tupCur2 = tempRef_tupCur2.get();
-                                    row5 = tempRef_row5.get();
+                                    tupCur2 = tempReference_tupCur2.get();
+                                    row5 = tempReference_row5.get();
                                 }
 
                                 if (ctx5 > 2) {
-                                    RefObject<ref RowBuffer>tempRef_row52 = new RefObject<ref
+                                    Reference<ref RowBuffer>tempRef_row52 = new Reference<ref
                                     RowBuffer > (row5);
                                     assert tupCur2.MoveNext(tempRef_row52);
                                     row5 = tempRef_row52.argValue;
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row53 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_tupCur22 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
-                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempRef_row53,
-                                        tempRef_tupCur22, ctx5));
-                                    tupCur2 = tempRef_tupCur22.get();
-                                    row5 = tempRef_row53.get();
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row53 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_tupCur22 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
+                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempReference_row53,
+                                        tempReference_tupCur22, ctx5));
+                                    tupCur2 = tempReference_tupCur22.get();
+                                    row5 = tempReference_row53.get();
                                 }
 
                                 if (ctx5 > 3) {
-                                    RefObject<ref RowBuffer>tempRef_row54 = new RefObject<ref
+                                    Reference<ref RowBuffer>tempRef_row54 = new Reference<ref
                                     RowBuffer > (row5);
                                     assert tupCur2.MoveNext(tempRef_row54);
                                     row5 = tempRef_row54.argValue;
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempRef_row55 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
-                                    RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempRef_tupCur23 = new RefObject<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
-                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempRef_row55,
-                                        tempRef_tupCur23, ctx5));
-                                    tupCur2 = tempRef_tupCur23.get();
-                                    row5 = tempRef_row55.get();
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer> tempReference_row55 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowBuffer>(row5);
+                                    Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor> tempReference_tupCur23 = new Reference<com.azure.data.cosmos.serialization.hybridrow.RowCursor>(tupCur2);
+                                    ResultAssert.IsSuccess(LayoutType.Int64.WriteSparse(tempReference_row55,
+                                        tempReference_tupCur23, ctx5));
+                                    tupCur2 = tempReference_tupCur23.get();
+                                    row5 = tempReference_row55.get();
                                 }
 
                                 return Result.Success;
                             }));
-                            tupCur = tempRef_tupCur2.get();
-                            row4 = tempRef_row43.get();
+                            tupCur = tempReference_tupCur2.get();
+                            row4 = tempReference_row43.get();
                         }
 
                         return Result.Success;
                     }));
                     row3 = tempRef_row32.argValue;
-                    row3 = tempRef_row3.get();
+                    row3 = tempReference_row3.get();
 
                     return Result.Success;
                 }));
-                arrCur = tempRef_arrCur.get();
-                row2 = tempRef_row2.get();
+                arrCur = tempReference_arrCur.get();
+                row2 = tempReference_row2.get();
 
-                RefObject<ref RowBuffer>tempRef_row22 = new RefObject<ref RowBuffer > (row2);
+                Reference<ref RowBuffer>tempRef_row22 = new Reference<ref RowBuffer > (row2);
                 assert !arrCur.MoveNext(tempRef_row22);
                 row2 = tempRef_row22.argValue;
             }
 
             return Result.Success;
         }));
-        history = tempRef_history.get();
-        row = tempRef_row3.get();
+        history = tempReference_history.get();
+        row = tempReference_row3.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -282,90 +284,90 @@ public final class TupleUnitTests {
         row.InitLayout(HybridRowVersion.V1, this.countersLayout, this.countersResolver);
 
         PerfCounter c1 = this.counterExample;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("value", out c);
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor valueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row3, out valueScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row3, out valueScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row5, ref valueScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row5, ref valueScope, c.TypeArgs,
             out valueScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         RowCursor valueScope2;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row6, out valueScope2).Find(tempRef_row7, c.Path);
-        row = tempRef_row7.get();
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row6, out valueScope2).Find(tempReference_row7, c.Path);
+        row = tempReference_row7.get();
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().ReadScope(tempRef_row8, ref valueScope2,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().ReadScope(tempReference_row8, ref valueScope2,
             out valueScope2));
-        row = tempRef_row8.get();
+        row = tempReference_row8.get();
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert valueScope.AsReadOnly(out _).ScopeType == valueScope2.ScopeType;
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert valueScope.AsReadOnly(out _).start == valueScope2.start;
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert valueScope.AsReadOnly(out _).Immutable == valueScope2.Immutable;
 
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.TypeConstraint(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row9, ref valueScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.TypeConstraint(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row9, ref valueScope,
             "millis", UpdateOptions.InsertAt));
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.TypeConstraint(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().DeleteSparse(tempRef_row10,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.TypeConstraint(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().DeleteSparse(tempReference_row10,
             ref valueScope));
-        row = tempRef_row10.get();
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
-        assert !valueScope.MoveTo(tempRef_row11, 2);
-        row = tempRef_row11.get();
+        row = tempReference_row10.get();
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
+        assert !valueScope.MoveTo(tempReference_row11, 2);
+        row = tempReference_row11.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -381,82 +383,82 @@ public final class TupleUnitTests {
         tempVar.Lng = 40L;
         c1.Coord = Tuple.Create("units", tempVar);
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("coord", out c);
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor valueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row3, out valueScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row3, out valueScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row5, ref valueScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row5, ref valueScope, c.TypeArgs,
             out valueScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.DateTime.WriteSparse(tempRef_row6, tempRef_valueScope,
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.DateTime.WriteSparse(tempReference_row6, tempReference_valueScope,
             LocalDateTime.now()));
-        valueScope = tempRef_valueScope.get();
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        valueScope = tempReference_valueScope.get();
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref valueScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref valueScope,
             "mins"));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
-        assert valueScope.MoveNext(tempRef_row8);
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope2 =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.Int8.WriteSparse(tempRef_row9, tempRef_valueScope2, (byte)42));
-        valueScope = tempRef_valueScope2.get();
-        row = tempRef_row9.get();
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
+        assert valueScope.MoveNext(tempReference_row8);
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope2 =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.Int8.WriteSparse(tempReference_row9, tempReference_valueScope2, (byte)42));
+        valueScope = tempReference_valueScope2.get();
+        row = tempReference_row9.get();
 
         TypeArgument coordType = c.TypeArgs[1];
 
         // Invalid because is a UDT but the wrong type.
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope3 =
-            new RefObject<RowCursor>(valueScope);
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope3 =
+            new Reference<RowCursor>(valueScope);
         RowCursor _;
-        OutObject<RowCursor> tempOut__ =
-            new OutObject<RowCursor>();
-        ResultAssert.TypeConstraint(coordType.getType().<LayoutUDT>TypeAs().WriteScope(tempRef_row10,
-            tempRef_valueScope3, new TypeArgumentList(this.countersLayout.getSchemaId().clone()), tempOut__));
+        Out<RowCursor> tempOut__ =
+            new Out<RowCursor>();
+        ResultAssert.TypeConstraint(coordType.getType().<LayoutUDT>TypeAs().WriteScope(tempReference_row10,
+            tempReference_valueScope3, new TypeArgumentList(this.countersLayout.getSchemaId().clone()), tempOut__));
         _ = tempOut__.get();
-        valueScope = tempRef_valueScope3.get();
-        row = tempRef_row10.get();
+        valueScope = tempReference_valueScope3.get();
+        row = tempReference_row10.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -466,72 +468,73 @@ public final class TupleUnitTests {
         row.InitLayout(HybridRowVersion.V1, this.countersLayout, this.countersResolver);
 
         PerfCounter c1 = this.counterExample;
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("value", out c);
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor valueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row3, out valueScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row3, out valueScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row5, ref valueScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row5, ref valueScope, c.TypeArgs,
             out valueScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.Boolean.WriteSparse(tempRef_row6, tempRef_valueScope, true));
-        valueScope = tempRef_valueScope.get();
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.Boolean.WriteSparse(tempReference_row6, tempReference_valueScope, true));
+        valueScope = tempReference_valueScope.get();
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref valueScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref valueScope,
             "millis"));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
-        assert valueScope.MoveNext(tempRef_row8);
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope2 =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.Float32.WriteSparse(tempRef_row9, tempRef_valueScope2, 0.1F));
-        valueScope = tempRef_valueScope2.get();
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
+        assert valueScope.MoveNext(tempReference_row8);
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope2 =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.Float32.WriteSparse(tempReference_row9, tempReference_valueScope2,
+            0.1F));
+        valueScope = tempReference_valueScope2.get();
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt64>TypeAs().WriteSparse(tempRef_row10, ref valueScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt64>TypeAs().WriteSparse(tempReference_row10, ref valueScope,
             100L));
-        row = tempRef_row10.get();
+        row = tempReference_row10.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -544,220 +547,221 @@ public final class TupleUnitTests {
         c1.Name = "RowInserts";
         c1.MinMaxValue = Tuple.Create("units", Tuple.Create(12L, 542L, 12046L));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteCounter(tempRef_row, RowCursor.Create(tempRef_row2, out _), c1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteCounter(tempReference_row, RowCursor.Create(tempReference_row2, out _), c1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         // ReSharper disable once StringLiteralTypo
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("minmeanmax", out c);
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor valueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row3, out valueScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row3, out valueScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row5, ref valueScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row5, ref valueScope, c.TypeArgs,
             out valueScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.DateTime.WriteSparse(tempRef_row6, tempRef_valueScope,
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.DateTime.WriteSparse(tempReference_row6, tempReference_valueScope,
             LocalDateTime.now()));
-        valueScope = tempRef_valueScope.get();
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        valueScope = tempReference_valueScope.get();
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref valueScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref valueScope,
             "secs"));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
-        assert valueScope.MoveNext(tempRef_row8);
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_valueScope2 =
-            new RefObject<RowCursor>(valueScope);
-        ResultAssert.TypeConstraint(LayoutType.Decimal.WriteSparse(tempRef_row9, tempRef_valueScope2, 12));
-        valueScope = tempRef_valueScope2.get();
-        row = tempRef_row9.get();
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
+        assert valueScope.MoveNext(tempReference_row8);
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_valueScope2 =
+            new Reference<RowCursor>(valueScope);
+        ResultAssert.TypeConstraint(LayoutType.Decimal.WriteSparse(tempReference_row9, tempReference_valueScope2, 12));
+        valueScope = tempReference_valueScope2.get();
+        row = tempReference_row9.get();
 
         TypeArgument mmmType = c.TypeArgs[1];
 
         // Invalid because not a tuple type.
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         RowCursor mmmScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row10,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row10,
             ref valueScope, TypeArgumentList.Empty, out mmmScope));
-        row = tempRef_row10.get();
+        row = tempReference_row10.get();
 
         // Invalid because is a tuple type but with the wrong parameters.
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row11,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row11,
             ref valueScope, new TypeArgumentList(new TypeArgument[]
             {
                 new TypeArgument(LayoutType.Boolean),
                 new TypeArgument(LayoutType.Int64)
             }), out mmmScope));
-        row = tempRef_row11.get();
+        row = tempReference_row11.get();
 
         // Invalid because is a tuple type but with the wrong arity.
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row12,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.TypeConstraint(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row12,
             ref valueScope, new TypeArgumentList(new TypeArgument[] { new TypeArgument(LayoutType.Utf8) }),
             out mmmScope));
-        row = tempRef_row12.get();
+        row = tempReference_row12.get();
 
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempRef_row13,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(tempReference_row13,
             ref valueScope, mmmType.getTypeArgs().clone(), out mmmScope));
-        row = tempRef_row13.get();
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row13.get();
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ResultAssert.TypeConstraint(LayoutType.Binary.WriteSparse(ref row, ref valueScope, new
         // byte[] { 1, 2, 3 }));
-        ResultAssert.TypeConstraint(LayoutType.Binary.WriteSparse(tempRef_row14, ref valueScope, new byte[] { 1, 2,
+        ResultAssert.TypeConstraint(LayoutType.Binary.WriteSparse(tempReference_row14, ref valueScope, new byte[] { 1
+            , 2,
             3 }));
-        row = tempRef_row14.get();
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_mmmScope =
-            new RefObject<RowCursor>(mmmScope);
-        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(0).getType().<LayoutInt64>TypeAs().WriteSparse(tempRef_row15
-            , tempRef_mmmScope, 1L));
-        mmmScope = tempRef_mmmScope.get();
-        row = tempRef_row15.get();
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
-        assert mmmScope.MoveNext(tempRef_row16);
-        row = tempRef_row16.get();
-        RefObject<RowBuffer> tempRef_row17 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_mmmScope2 =
-            new RefObject<RowCursor>(mmmScope);
-        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().WriteSparse(tempRef_row17
-            , tempRef_mmmScope2, 2L));
-        mmmScope = tempRef_mmmScope2.get();
-        row = tempRef_row17.get();
-        RefObject<RowBuffer> tempRef_row18 =
-            new RefObject<RowBuffer>(row);
-        assert mmmScope.MoveNext(tempRef_row18);
-        row = tempRef_row18.get();
-        RefObject<RowBuffer> tempRef_row19 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_mmmScope3 =
-            new RefObject<RowCursor>(mmmScope);
-        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(2).getType().<LayoutInt64>TypeAs().WriteSparse(tempRef_row19
-            , tempRef_mmmScope3, 3L));
-        mmmScope = tempRef_mmmScope3.get();
-        row = tempRef_row19.get();
+        row = tempReference_row14.get();
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_mmmScope =
+            new Reference<RowCursor>(mmmScope);
+        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(0).getType().<LayoutInt64>TypeAs().WriteSparse(tempReference_row15
+            , tempReference_mmmScope, 1L));
+        mmmScope = tempReference_mmmScope.get();
+        row = tempReference_row15.get();
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
+        assert mmmScope.MoveNext(tempReference_row16);
+        row = tempReference_row16.get();
+        Reference<RowBuffer> tempReference_row17 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_mmmScope2 =
+            new Reference<RowCursor>(mmmScope);
+        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().WriteSparse(tempReference_row17
+            , tempReference_mmmScope2, 2L));
+        mmmScope = tempReference_mmmScope2.get();
+        row = tempReference_row17.get();
+        Reference<RowBuffer> tempReference_row18 =
+            new Reference<RowBuffer>(row);
+        assert mmmScope.MoveNext(tempReference_row18);
+        row = tempReference_row18.get();
+        Reference<RowBuffer> tempReference_row19 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_mmmScope3 =
+            new Reference<RowCursor>(mmmScope);
+        ResultAssert.IsSuccess(mmmType.getTypeArgs().get(2).getType().<LayoutInt64>TypeAs().WriteSparse(tempReference_row19
+            , tempReference_mmmScope3, 3L));
+        mmmScope = tempReference_mmmScope3.get();
+        row = tempReference_row19.get();
     }
 
-    private static Coord ReadCoord(RefObject<RowBuffer> row, RefObject<RowCursor> coordScope) {
+    private static Coord ReadCoord(Reference<RowBuffer> row, Reference<RowCursor> coordScope) {
         Layout coordLayout = coordScope.get().getLayout();
         Coord cd = new Coord();
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert coordLayout.TryFind("lat", out c);
-        OutObject<Long> tempOut_Lat = new OutObject<Long>();
+        Out<Long> tempOut_Lat = new Out<Long>();
         ResultAssert.IsSuccess(c.<LayoutInt64>TypeAs().ReadFixed(row, coordScope, c, tempOut_Lat));
         cd.Lat = tempOut_Lat.get();
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert coordLayout.TryFind("lng", out c);
-        OutObject<Long> tempOut_Lng = new OutObject<Long>();
+        Out<Long> tempOut_Lng = new Out<Long>();
         ResultAssert.IsSuccess(c.<LayoutInt64>TypeAs().ReadFixed(row, coordScope, c, tempOut_Lng));
         cd.Lng = tempOut_Lng.get();
 
         return cd;
     }
 
-    private PerfCounter ReadCounter(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private PerfCounter ReadCounter(Reference<RowBuffer> row, Reference<RowCursor> root) {
         PerfCounter pc = new PerfCounter();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("name", out c);
-        OutObject<String> tempOut_Name = new OutObject<String>();
+        Out<String> tempOut_Name = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Name));
         pc.Name = tempOut_Name.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("value", out c);
         assert c.Type.Immutable;
         RowCursor valueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out valueScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutIndexedScope>TypeAs().ReadScope(row, ref valueScope, out valueScope) == Result.Success) {
             assert valueScope.Immutable;
             assert valueScope.MoveNext(row);
             String units;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref valueScope, out units));
             assert valueScope.MoveNext(row);
             long metric;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt64>TypeAs().ReadSparse(row, ref valueScope,
                 out metric));
@@ -766,157 +770,157 @@ public final class TupleUnitTests {
 
         // ReSharper disable once StringLiteralTypo
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("minmeanmax", out c);
         assert c.Type.Immutable;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out valueScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutIndexedScope>TypeAs().ReadScope(row, ref valueScope, out valueScope) == Result.Success) {
             assert valueScope.Immutable;
             assert valueScope.MoveNext(row);
             String units;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref valueScope, out units));
 
             assert valueScope.MoveNext(row);
             TypeArgument mmmType = c.TypeArgs[1];
-            RefObject<RowCursor> tempRef_valueScope =
-                new RefObject<RowCursor>(valueScope);
+            Reference<RowCursor> tempReference_valueScope =
+                new Reference<RowCursor>(valueScope);
             RowCursor mmmScope;
-            OutObject<RowCursor> tempOut_mmmScope =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(mmmType.getType().<LayoutIndexedScope>TypeAs().ReadScope(row, tempRef_valueScope,
+            Out<RowCursor> tempOut_mmmScope =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(mmmType.getType().<LayoutIndexedScope>TypeAs().ReadScope(row, tempReference_valueScope,
                 tempOut_mmmScope));
             mmmScope = tempOut_mmmScope.get();
-            valueScope = tempRef_valueScope.get();
+            valueScope = tempReference_valueScope.get();
 
             assert mmmScope.Immutable;
             assert mmmScope.MoveNext(row);
-            RefObject<RowCursor> tempRef_mmmScope =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope =
+                new Reference<RowCursor>(mmmScope);
             long min;
-            OutObject<Long> tempOut_min = new OutObject<Long>();
+            Out<Long> tempOut_min = new Out<Long>();
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(0).getType().<LayoutInt64>TypeAs().ReadSparse(row,
-                tempRef_mmmScope, tempOut_min));
+                tempReference_mmmScope, tempOut_min));
             min = tempOut_min.get();
-            mmmScope = tempRef_mmmScope.get();
+            mmmScope = tempReference_mmmScope.get();
             assert mmmScope.MoveNext(row);
-            RefObject<RowCursor> tempRef_mmmScope2 =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope2 =
+                new Reference<RowCursor>(mmmScope);
             long mean;
-            OutObject<Long> tempOut_mean = new OutObject<Long>();
+            Out<Long> tempOut_mean = new Out<Long>();
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().ReadSparse(row,
-                tempRef_mmmScope2, tempOut_mean));
+                tempReference_mmmScope2, tempOut_mean));
             mean = tempOut_mean.get();
-            mmmScope = tempRef_mmmScope2.get();
+            mmmScope = tempReference_mmmScope2.get();
             assert mmmScope.MoveNext(row);
-            RefObject<RowCursor> tempRef_mmmScope3 =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope3 =
+                new Reference<RowCursor>(mmmScope);
             long max;
-            OutObject<Long> tempOut_max = new OutObject<Long>();
+            Out<Long> tempOut_max = new Out<Long>();
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(2).getType().<LayoutInt64>TypeAs().ReadSparse(row,
-                tempRef_mmmScope3, tempOut_max));
+                tempReference_mmmScope3, tempOut_max));
             max = tempOut_max.get();
-            mmmScope = tempRef_mmmScope3.get();
+            mmmScope = tempReference_mmmScope3.get();
 
             pc.MinMaxValue = Tuple.Create(units, Tuple.Create(min, mean, max));
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("coord", out c);
         assert c.Type.Immutable;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out valueScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutIndexedScope>TypeAs().ReadScope(row, ref valueScope, out valueScope) == Result.Success) {
             assert valueScope.Immutable;
             assert valueScope.MoveNext(row);
             String units;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref valueScope, out units));
 
             assert valueScope.MoveNext(row);
             RowCursor coordScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutUDT>TypeAs().ReadScope(row, ref valueScope,
                 out coordScope));
-            RefObject<RowCursor> tempRef_coordScope = new RefObject<RowCursor>(coordScope);
-            pc.Coord = Tuple.Create(units, TupleUnitTests.ReadCoord(row, tempRef_coordScope));
-            coordScope = tempRef_coordScope.get();
+            Reference<RowCursor> tempReference_coordScope = new Reference<RowCursor>(coordScope);
+            pc.Coord = Tuple.Create(units, TupleUnitTests.ReadCoord(row, tempReference_coordScope));
+            coordScope = tempReference_coordScope.get();
         }
 
         return pc;
     }
 
-    private static void WriteCoord(RefObject<RowBuffer> row, RefObject<RowCursor> coordScope, TypeArgumentList typeArgs, Coord cd) {
+    private static void WriteCoord(Reference<RowBuffer> row, Reference<RowCursor> coordScope, TypeArgumentList typeArgs, Coord cd) {
         Layout coordLayout = row.get().getResolver().Resolve(typeArgs.getSchemaId().clone());
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert coordLayout.TryFind("lat", out c);
         ResultAssert.IsSuccess(c.<LayoutInt64>TypeAs().WriteFixed(row, coordScope, c, cd.Lat));
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert coordLayout.TryFind("lng", out c);
         ResultAssert.IsSuccess(c.<LayoutInt64>TypeAs().WriteFixed(row, coordScope, c, cd.Lng));
     }
 
-    private void WriteCounter(RefObject<RowBuffer> row, RefObject<RowCursor> root, PerfCounter pc) {
+    private void WriteCounter(Reference<RowBuffer> row, Reference<RowCursor> root, PerfCounter pc) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.countersLayout.TryFind("name", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, pc.Name));
 
         if (pc.Value != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.countersLayout.TryFind("value", out c);
             RowCursor valueScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out valueScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(row, ref valueScope, c.TypeArgs,
                 out valueScope));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref valueScope,
                 pc.Value.Item1));
             assert valueScope.MoveNext(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[1].Type.<LayoutInt64>TypeAs().WriteSparse(row, ref valueScope,
                 pc.Value.Item2));
@@ -925,24 +929,24 @@ public final class TupleUnitTests {
         if (pc.MinMaxValue != null) {
             // ReSharper disable once StringLiteralTypo
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.countersLayout.TryFind("minmeanmax", out c);
             RowCursor valueScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out valueScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(row, ref valueScope, c.TypeArgs,
                 out valueScope));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref valueScope,
                 pc.MinMaxValue.Item1));
@@ -951,74 +955,74 @@ public final class TupleUnitTests {
             TypeArgument mmmType = c.TypeArgs[1];
             RowCursor mmmScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(mmmType.getType().<LayoutIndexedScope>TypeAs().WriteScope(row, ref valueScope,
                 mmmType.getTypeArgs().clone(), out mmmScope));
 
-            RefObject<RowCursor> tempRef_mmmScope =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope =
+                new Reference<RowCursor>(mmmScope);
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(0).getType().<LayoutInt64>TypeAs().WriteSparse(row,
-                tempRef_mmmScope, pc.MinMaxValue.Item2.Item1));
-            mmmScope = tempRef_mmmScope.get();
+                tempReference_mmmScope, pc.MinMaxValue.Item2.Item1));
+            mmmScope = tempReference_mmmScope.get();
 
             assert mmmScope.MoveNext(row);
-            RefObject<RowCursor> tempRef_mmmScope2 =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope2 =
+                new Reference<RowCursor>(mmmScope);
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().WriteSparse(row,
-                tempRef_mmmScope2, pc.MinMaxValue.Item2.Item2));
-            mmmScope = tempRef_mmmScope2.get();
+                tempReference_mmmScope2, pc.MinMaxValue.Item2.Item2));
+            mmmScope = tempReference_mmmScope2.get();
 
             assert mmmScope.MoveNext(row);
-            RefObject<RowCursor> tempRef_mmmScope3 =
-                new RefObject<RowCursor>(mmmScope);
+            Reference<RowCursor> tempReference_mmmScope3 =
+                new Reference<RowCursor>(mmmScope);
             ResultAssert.IsSuccess(mmmType.getTypeArgs().get(2).getType().<LayoutInt64>TypeAs().WriteSparse(row,
-                tempRef_mmmScope3, pc.MinMaxValue.Item2.Item3));
-            mmmScope = tempRef_mmmScope3.get();
+                tempReference_mmmScope3, pc.MinMaxValue.Item2.Item3));
+            mmmScope = tempReference_mmmScope3.get();
         }
 
         if (pc.Coord != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.countersLayout.TryFind("coord", out c);
             RowCursor valueScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out valueScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutIndexedScope>TypeAs().WriteScope(row, ref valueScope, c.TypeArgs,
                 out valueScope));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref valueScope,
                 pc.Coord.Item1));
 
             assert valueScope.MoveNext(row);
             TypeArgument mmmType = c.TypeArgs[1];
-            RefObject<RowCursor> tempRef_valueScope =
-                new RefObject<RowCursor>(valueScope);
+            Reference<RowCursor> tempReference_valueScope =
+                new Reference<RowCursor>(valueScope);
             RowCursor coordScope;
-            OutObject<RowCursor> tempOut_coordScope =
-                new OutObject<RowCursor>();
-            ResultAssert.IsSuccess(mmmType.getType().<LayoutUDT>TypeAs().WriteScope(row, tempRef_valueScope,
+            Out<RowCursor> tempOut_coordScope =
+                new Out<RowCursor>();
+            ResultAssert.IsSuccess(mmmType.getType().<LayoutUDT>TypeAs().WriteScope(row, tempReference_valueScope,
                 mmmType.getTypeArgs().clone(), tempOut_coordScope));
             coordScope = tempOut_coordScope.get();
-            valueScope = tempRef_valueScope.get();
-            RefObject<RowCursor> tempRef_coordScope =
-                new RefObject<RowCursor>(coordScope);
-            TupleUnitTests.WriteCoord(row, tempRef_coordScope, mmmType.getTypeArgs().clone(), pc.Coord.Item2);
-            coordScope = tempRef_coordScope.get();
+            valueScope = tempReference_valueScope.get();
+            Reference<RowCursor> tempReference_coordScope =
+                new Reference<RowCursor>(coordScope);
+            TupleUnitTests.WriteCoord(row, tempReference_coordScope, mmmType.getTypeArgs().clone(), pc.Coord.Item2);
+            coordScope = tempReference_coordScope.get();
         }
     }
 
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedArrayUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedArrayUnitTests.java
index 243432a..9d5d85c 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedArrayUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedArrayUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -55,26 +56,26 @@ public final class TypedArrayUnitTests {
         t1.Priority = new ArrayList<Tuple<String, Long>>(Arrays.asList(Tuple.Create("80's", 100L), Tuple.Create(
             "classics", 100L), Tuple.Create("pop", 50L)));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteTagged(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteTagged(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Tagged t2 = this.ReadTagged(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Tagged t2 = this.ReadTagged(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert t1 == t2;
     }
 
@@ -88,56 +89,56 @@ public final class TypedArrayUnitTests {
             x -> x.Name.equals("Tagged")).SchemaId);
     }
 
-    private static SimilarMatch ReadSimilarMatch(RefObject<RowBuffer> row,
-                                                 RefObject<RowCursor> matchScope) {
+    private static SimilarMatch ReadSimilarMatch(Reference<RowBuffer> row,
+                                                 Reference<RowCursor> matchScope) {
         Layout matchLayout = matchScope.get().getLayout();
         SimilarMatch m = new SimilarMatch();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("thumbprint", out c);
-        OutObject<String> tempOut_Thumbprint = new OutObject<String>();
+        Out<String> tempOut_Thumbprint = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadFixed(row, matchScope, c, tempOut_Thumbprint));
         m.Thumbprint = tempOut_Thumbprint.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("score", out c);
-        OutObject<Double> tempOut_Score = new OutObject<Double>();
+        Out<Double> tempOut_Score = new Out<Double>();
         ResultAssert.IsSuccess(c.<LayoutFloat64>TypeAs().ReadFixed(row, matchScope, c, tempOut_Score));
         m.Score = tempOut_Score.get();
         return m;
     }
 
-    private Tagged ReadTagged(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Tagged ReadTagged(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Tagged value = new Tagged();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("title", out c);
-        OutObject<String> tempOut_Title = new OutObject<String>();
+        Out<String> tempOut_Title = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, root, c, tempOut_Title));
         value.Title = tempOut_Title.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("tags", out c);
         RowCursor tagsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tagsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref tagsScope, out tagsScope) == Result.Success) {
             value.Tags = new ArrayList<String>();
             while (tagsScope.MoveNext(row)) {
                 String item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref tagsScope,
                     out item));
@@ -146,47 +147,47 @@ public final class TypedArrayUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("options", out c);
         RowCursor optionsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out optionsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref optionsScope, out optionsScope) == Result.Success) {
             value.Options = new ArrayList<Integer>();
             while (optionsScope.MoveNext(row)) {
                 TypeArgument itemType = c.TypeArgs[0];
-                RefObject<RowCursor> tempRef_optionsScope =
-                    new RefObject<RowCursor>(optionsScope);
+                Reference<RowCursor> tempReference_optionsScope =
+                    new Reference<RowCursor>(optionsScope);
                 RowCursor nullableScope;
-                OutObject<RowCursor> tempOut_nullableScope =
-                    new OutObject<RowCursor>();
+                Out<RowCursor> tempOut_nullableScope =
+                    new Out<RowCursor>();
                 ResultAssert.IsSuccess(itemType.getType().<LayoutNullable>TypeAs().ReadScope(row,
-                    tempRef_optionsScope, tempOut_nullableScope));
+                    tempReference_optionsScope, tempOut_nullableScope));
                 nullableScope = tempOut_nullableScope.get();
-                optionsScope = tempRef_optionsScope.get();
+                optionsScope = tempReference_optionsScope.get();
 
                 if (nullableScope.MoveNext(row)) {
-                    RefObject<RowCursor> tempRef_nullableScope = new RefObject<RowCursor>(nullableScope);
-                    ResultAssert.IsSuccess(LayoutNullable.HasValue(row, tempRef_nullableScope));
-                    nullableScope = tempRef_nullableScope.get();
+                    Reference<RowCursor> tempReference_nullableScope = new Reference<RowCursor>(nullableScope);
+                    ResultAssert.IsSuccess(LayoutNullable.HasValue(row, tempReference_nullableScope));
+                    nullableScope = tempReference_nullableScope.get();
 
-                    RefObject<RowCursor> tempRef_nullableScope2 = new RefObject<RowCursor>(nullableScope);
+                    Reference<RowCursor> tempReference_nullableScope2 = new Reference<RowCursor>(nullableScope);
                     int itemValue;
-                    OutObject<Integer> tempOut_itemValue = new OutObject<Integer>();
-                    ResultAssert.IsSuccess(itemType.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs().ReadSparse(row, tempRef_nullableScope2, tempOut_itemValue));
+                    Out<Integer> tempOut_itemValue = new Out<Integer>();
+                    ResultAssert.IsSuccess(itemType.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs().ReadSparse(row, tempReference_nullableScope2, tempOut_itemValue));
                     itemValue = tempOut_itemValue.get();
-                    nullableScope = tempRef_nullableScope2.get();
+                    nullableScope = tempReference_nullableScope2.get();
 
                     value.Options.add(itemValue);
                 } else {
-                    RefObject<RowCursor> tempRef_nullableScope3 = new RefObject<RowCursor>(nullableScope);
-                    ResultAssert.NotFound(LayoutNullable.HasValue(row, tempRef_nullableScope3));
-                    nullableScope = tempRef_nullableScope3.get();
+                    Reference<RowCursor> tempReference_nullableScope3 = new Reference<RowCursor>(nullableScope);
+                    ResultAssert.NotFound(LayoutNullable.HasValue(row, tempReference_nullableScope3));
+                    nullableScope = tempReference_nullableScope3.get();
 
                     value.Options.add(null);
                 }
@@ -194,184 +195,184 @@ public final class TypedArrayUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("ratings", out c);
         RowCursor ratingsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out ratingsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref ratingsScope, out ratingsScope) == Result.Success) {
             value.Ratings = new ArrayList<ArrayList<Double>>();
             TypeArgument innerType = c.TypeArgs[0];
             LayoutTypedArray innerLayout = innerType.getType().<LayoutTypedArray>TypeAs();
             RowCursor innerScope = null;
-            RefObject<RowCursor> tempRef_innerScope =
-                new RefObject<RowCursor>(innerScope);
-            while (ratingsScope.MoveNext(row, tempRef_innerScope)) {
-                innerScope = tempRef_innerScope.get();
+            Reference<RowCursor> tempReference_innerScope =
+                new Reference<RowCursor>(innerScope);
+            while (ratingsScope.MoveNext(row, tempReference_innerScope)) {
+                innerScope = tempReference_innerScope.get();
                 ArrayList<Double> item = new ArrayList<Double>();
-                RefObject<RowCursor> tempRef_ratingsScope =
-                    new RefObject<RowCursor>(ratingsScope);
-                OutObject<RowCursor> tempOut_innerScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_ratingsScope, tempOut_innerScope));
+                Reference<RowCursor> tempReference_ratingsScope =
+                    new Reference<RowCursor>(ratingsScope);
+                Out<RowCursor> tempOut_innerScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_ratingsScope, tempOut_innerScope));
                 innerScope = tempOut_innerScope.get();
-                ratingsScope = tempRef_ratingsScope.get();
+                ratingsScope = tempReference_ratingsScope.get();
                 while (RowCursorExtensions.MoveNext(innerScope.clone()
                     , row)) {
                     LayoutFloat64 itemLayout = innerType.getTypeArgs().get(0).getType().<LayoutFloat64>TypeAs();
-                    RefObject<RowCursor> tempRef_innerScope2
-                        = new RefObject<RowCursor>(innerScope);
+                    Reference<RowCursor> tempReference_innerScope2
+                        = new Reference<RowCursor>(innerScope);
                     double innerItem;
-                    OutObject<Double> tempOut_innerItem = new OutObject<Double>();
-                    ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempRef_innerScope2, tempOut_innerItem));
+                    Out<Double> tempOut_innerItem = new Out<Double>();
+                    ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempReference_innerScope2, tempOut_innerItem));
                     innerItem = tempOut_innerItem.get();
-                    innerScope = tempRef_innerScope2.get();
+                    innerScope = tempReference_innerScope2.get();
                     item.add(innerItem);
                 }
 
                 value.Ratings.add(item);
             }
-            innerScope = tempRef_innerScope.get();
+            innerScope = tempReference_innerScope.get();
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("similars", out c);
         RowCursor similarsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out similarsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref similarsScope, out similarsScope) == Result.Success) {
             value.Similars = new ArrayList<SimilarMatch>();
             while (similarsScope.MoveNext(row)) {
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutUDT innerLayout = innerType.getType().<LayoutUDT>TypeAs();
-                RefObject<RowCursor> tempRef_similarsScope =
-                    new RefObject<RowCursor>(similarsScope);
+                Reference<RowCursor> tempReference_similarsScope =
+                    new Reference<RowCursor>(similarsScope);
                 RowCursor matchScope;
-                OutObject<RowCursor> tempOut_matchScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_similarsScope, tempOut_matchScope));
+                Out<RowCursor> tempOut_matchScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_similarsScope, tempOut_matchScope));
                 matchScope = tempOut_matchScope.get();
-                similarsScope = tempRef_similarsScope.get();
-                RefObject<RowCursor> tempRef_matchScope =
-                    new RefObject<RowCursor>(matchScope);
-                SimilarMatch item = TypedArrayUnitTests.ReadSimilarMatch(row, tempRef_matchScope);
-                matchScope = tempRef_matchScope.get();
+                similarsScope = tempReference_similarsScope.get();
+                Reference<RowCursor> tempReference_matchScope =
+                    new Reference<RowCursor>(matchScope);
+                SimilarMatch item = TypedArrayUnitTests.ReadSimilarMatch(row, tempReference_matchScope);
+                matchScope = tempReference_matchScope.get();
                 value.Similars.add(item);
             }
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("priority", out c);
         RowCursor priorityScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out priorityScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutTypedArray>TypeAs().ReadScope(row, ref priorityScope, out priorityScope) == Result.Success) {
             value.Priority = new ArrayList<Tuple<String, Long>>();
             RowCursor tupleScope = null;
-            RefObject<RowCursor> tempRef_tupleScope =
-                new RefObject<RowCursor>(tupleScope);
-            while (priorityScope.MoveNext(row, tempRef_tupleScope)) {
-                tupleScope = tempRef_tupleScope.get();
+            Reference<RowCursor> tempReference_tupleScope =
+                new Reference<RowCursor>(tupleScope);
+            while (priorityScope.MoveNext(row, tempReference_tupleScope)) {
+                tupleScope = tempReference_tupleScope.get();
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutIndexedScope innerLayout = innerType.getType().<LayoutIndexedScope>TypeAs();
 
-                RefObject<RowCursor> tempRef_priorityScope =
-                    new RefObject<RowCursor>(priorityScope);
-                OutObject<RowCursor> tempOut_tupleScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_priorityScope, tempOut_tupleScope));
+                Reference<RowCursor> tempReference_priorityScope =
+                    new Reference<RowCursor>(priorityScope);
+                Out<RowCursor> tempOut_tupleScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_priorityScope, tempOut_tupleScope));
                 tupleScope = tempOut_tupleScope.get();
-                priorityScope = tempRef_priorityScope.get();
+                priorityScope = tempReference_priorityScope.get();
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
                     , row);
-                RefObject<RowCursor> tempRef_tupleScope2 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope2 =
+                    new Reference<RowCursor>(tupleScope);
                 String item1;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutUtf8>TypeAs().ReadSparse(row,
-                    tempRef_tupleScope2, out item1));
-                tupleScope = tempRef_tupleScope2.get();
+                    tempReference_tupleScope2, out item1));
+                tupleScope = tempReference_tupleScope2.get();
 
                 assert RowCursorExtensions.MoveNext(tupleScope.clone()
                     , row);
-                RefObject<RowCursor> tempRef_tupleScope3 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope3 =
+                    new Reference<RowCursor>(tupleScope);
                 long item2;
-                OutObject<Long> tempOut_item2 = new OutObject<Long>();
+                Out<Long> tempOut_item2 = new Out<Long>();
                 ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().ReadSparse(row,
-                    tempRef_tupleScope3, tempOut_item2));
+                    tempReference_tupleScope3, tempOut_item2));
                 item2 = tempOut_item2.get();
-                tupleScope = tempRef_tupleScope3.get();
+                tupleScope = tempReference_tupleScope3.get();
 
                 value.Priority.add(Tuple.Create(item1, item2));
             }
-            tupleScope = tempRef_tupleScope.get();
+            tupleScope = tempReference_tupleScope.get();
         }
 
         return value;
     }
 
-    private static void WriteSimilarMatch(RefObject<RowBuffer> row, RefObject<RowCursor> matchScope
+    private static void WriteSimilarMatch(Reference<RowBuffer> row, Reference<RowCursor> matchScope
         , TypeArgumentList typeArgs, SimilarMatch m) {
         Layout matchLayout = row.get().getResolver().Resolve(typeArgs.getSchemaId().clone());
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("thumbprint", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteFixed(row, matchScope, c, m.Thumbprint));
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("score", out c);
         ResultAssert.IsSuccess(c.<LayoutFloat64>TypeAs().WriteFixed(row, matchScope, c, m.Score));
     }
 
-    private void WriteTagged(RefObject<RowBuffer> row, RefObject<RowCursor> root, Tagged value) {
+    private void WriteTagged(Reference<RowBuffer> row, Reference<RowCursor> root, Tagged value) {
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("title", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, root, c, value.Title));
 
         if (value.Tags != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("tags", out c);
             RowCursor tagsScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out tagsScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, ref tagsScope, c.TypeArgs,
                 out tagsScope));
             for (String item : value.Tags) {
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(row, ref tagsScope, item));
                 assert !tagsScope.MoveNext(row);
@@ -380,19 +381,19 @@ public final class TypedArrayUnitTests {
 
         if (value.Options != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("options", out c);
             RowCursor optionsScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out optionsScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, ref optionsScope, c.TypeArgs,
                 out optionsScope));
@@ -400,22 +401,22 @@ public final class TypedArrayUnitTests {
                 TypeArgument itemType = c.TypeArgs[0];
                 RowCursor nullableScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(itemType.getType().<LayoutNullable>TypeAs().WriteScope(row, ref optionsScope,
                     itemType.getTypeArgs().clone(), item != null, out nullableScope));
 
                 if (item != null) {
-                    RefObject<RowCursor> tempRef_nullableScope = new RefObject<RowCursor>(nullableScope);
-                    ResultAssert.IsSuccess(itemType.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs().WriteSparse(row, tempRef_nullableScope, item.intValue()));
-                    nullableScope = tempRef_nullableScope.get();
+                    Reference<RowCursor> tempReference_nullableScope = new Reference<RowCursor>(nullableScope);
+                    ResultAssert.IsSuccess(itemType.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs().WriteSparse(row, tempReference_nullableScope, item.intValue()));
+                    nullableScope = tempReference_nullableScope.get();
                 }
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !optionsScope.MoveNext(row, ref nullableScope);
             }
@@ -423,19 +424,19 @@ public final class TypedArrayUnitTests {
 
         if (value.Ratings != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("ratings", out c);
             RowCursor ratingsScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out ratingsScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, ref ratingsScope, c.TypeArgs,
                 out ratingsScope));
@@ -443,26 +444,26 @@ public final class TypedArrayUnitTests {
                 assert item != null;
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutTypedArray innerLayout = innerType.getType().<LayoutTypedArray>TypeAs();
-                RefObject<RowCursor> tempRef_ratingsScope =
-                    new RefObject<RowCursor>(ratingsScope);
+                Reference<RowCursor> tempReference_ratingsScope =
+                    new Reference<RowCursor>(ratingsScope);
                 RowCursor innerScope;
-                OutObject<RowCursor> tempOut_innerScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempRef_ratingsScope,
+                Out<RowCursor> tempOut_innerScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempReference_ratingsScope,
                     innerType.getTypeArgs().clone(), tempOut_innerScope));
                 innerScope = tempOut_innerScope.get();
-                ratingsScope = tempRef_ratingsScope.get();
+                ratingsScope = tempReference_ratingsScope.get();
                 for (double innerItem : item) {
                     LayoutFloat64 itemLayout = innerType.getTypeArgs().get(0).getType().<LayoutFloat64>TypeAs();
-                    RefObject<RowCursor> tempRef_innerScope =
-                        new RefObject<RowCursor>(innerScope);
-                    ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempRef_innerScope, innerItem));
-                    innerScope = tempRef_innerScope.get();
+                    Reference<RowCursor> tempReference_innerScope =
+                        new Reference<RowCursor>(innerScope);
+                    ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempReference_innerScope, innerItem));
+                    innerScope = tempReference_innerScope.get();
                     assert !innerScope.MoveNext(row);
                 }
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !ratingsScope.MoveNext(row, ref innerScope);
             }
@@ -470,41 +471,41 @@ public final class TypedArrayUnitTests {
 
         if (value.Similars != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("similars", out c);
             RowCursor similarsScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out similarsScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, ref similarsScope, c.TypeArgs,
                 out similarsScope));
             for (SimilarMatch item : value.Similars) {
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutUDT innerLayout = innerType.getType().<LayoutUDT>TypeAs();
-                RefObject<RowCursor> tempRef_similarsScope =
-                    new RefObject<RowCursor>(similarsScope);
+                Reference<RowCursor> tempReference_similarsScope =
+                    new Reference<RowCursor>(similarsScope);
                 RowCursor matchScope;
-                OutObject<RowCursor> tempOut_matchScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempRef_similarsScope,
+                Out<RowCursor> tempOut_matchScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempReference_similarsScope,
                     innerType.getTypeArgs().clone(), tempOut_matchScope));
                 matchScope = tempOut_matchScope.get();
-                similarsScope = tempRef_similarsScope.get();
-                RefObject<RowCursor> tempRef_matchScope =
-                    new RefObject<RowCursor>(matchScope);
-                TypedArrayUnitTests.WriteSimilarMatch(row, tempRef_matchScope, innerType.getTypeArgs().clone(), item);
-                matchScope = tempRef_matchScope.get();
+                similarsScope = tempReference_similarsScope.get();
+                Reference<RowCursor> tempReference_matchScope =
+                    new Reference<RowCursor>(matchScope);
+                TypedArrayUnitTests.WriteSimilarMatch(row, tempReference_matchScope, innerType.getTypeArgs().clone(), item);
+                matchScope = tempReference_matchScope.get();
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !similarsScope.MoveNext(row, ref matchScope);
             }
@@ -512,19 +513,19 @@ public final class TypedArrayUnitTests {
 
         if (value.Priority != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("priority", out c);
             RowCursor priorityScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out priorityScope).Find(row, c.Path);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutTypedArray>TypeAs().WriteScope(row, ref priorityScope, c.TypeArgs,
                 out priorityScope));
@@ -533,27 +534,27 @@ public final class TypedArrayUnitTests {
                 LayoutIndexedScope innerLayout = innerType.getType().<LayoutIndexedScope>TypeAs();
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(innerLayout.WriteScope(row, ref priorityScope, innerType.getTypeArgs().clone()
                     , out tupleScope));
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutUtf8>TypeAs().WriteSparse(row,
                     ref tupleScope, item.Item1));
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutInt64>TypeAs().WriteSparse(row
-                    , tempRef_tupleScope, item.Item2));
-                tupleScope = tempRef_tupleScope.get();
+                    , tempReference_tupleScope, item.Item2));
+                tupleScope = tempReference_tupleScope.get();
 
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 assert !priorityScope.MoveNext(row, ref tupleScope);
             }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedMapUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedMapUnitTests.java
index d894beb..d7a06dc 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedMapUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedMapUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -61,26 +62,26 @@ public final class TypedMapUnitTests {
             Map.entry(LocalDateTime.parse("01/31/1997"), tempVar3)));
 
         // ReSharper restore StringLiteralTypo
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteMovie(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteMovie(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Movie t2 = this.ReadMovie(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Movie t2 = this.ReadMovie(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert t1 == t2;
     }
 
@@ -89,10 +90,10 @@ public final class TypedMapUnitTests {
     public void FindAndDelete() {
         RowBuffer row = new RowBuffer(TypedMapUnitTests.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
 
         ArrayList<String> expected = new ArrayList<String>(Arrays.asList("Mark", "Harrison", "Carrie"));
 
@@ -100,82 +101,82 @@ public final class TypedMapUnitTests {
             Movie t1 = new Movie();
             t1.Cast = new HashMap<String, String>(Map.ofEntries(Map.entry("Mark", "Luke"), Map.entry("Harrison", "Han"
             ), Map.entry("Carrie", "Leia")));
-            RefObject<RowBuffer> tempRef_row2 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row2 =
+                new Reference<RowBuffer>(row);
             RowCursor _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            this.WriteMovie(tempRef_row2, root.Clone(out _), t1);
-            row = tempRef_row2.get();
+            this.WriteMovie(tempReference_row2, root.Clone(out _), t1);
+            row = tempReference_row2.get();
 
             // Attempt to find each item in turn and then delete it.
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("cast", out c);
-            RefObject<RowBuffer> tempRef_row3 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row3 =
+                new Reference<RowBuffer>(row);
             RowCursor mapScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out mapScope).Find(tempRef_row3, c.Path);
-            row = tempRef_row3.get();
-            RefObject<RowBuffer> tempRef_row4 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out mapScope).Find(tempReference_row3, c.Path);
+            row = tempReference_row3.get();
+            Reference<RowBuffer> tempReference_row4 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row4, ref mapScope, out mapScope));
-            row = tempRef_row4.get();
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row4, ref mapScope, out mapScope));
+            row = tempReference_row4.get();
             for (String key : permutation) {
                 KeyValuePair<String, String> pair = new KeyValuePair<String, String>(key, "map lookup matches only on" +
                     " key");
-                RefObject<RowBuffer> tempRef_row5 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row5 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row5, Utf8String.Empty);
-                row = tempRef_row5.get();
-                RefObject<RowBuffer> tempRef_row6 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row6, tempRef_tempCursor, c.TypeArgs,
+                root.Clone(out tempCursor).Find(tempReference_row5, Utf8String.Empty);
+                row = tempReference_row5.get();
+                Reference<RowBuffer> tempReference_row6 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row6, tempReference_tempCursor, c.TypeArgs,
                     pair));
-                tempCursor = tempRef_tempCursor.get();
-                row = tempRef_row6.get();
-                RefObject<RowBuffer> tempRef_row7 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor.get();
+                row = tempReference_row6.get();
+                Reference<RowBuffer> tempReference_row7 =
+                    new Reference<RowBuffer>(row);
                 RowCursor findScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row7, ref mapScope, ref tempCursor,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row7, ref mapScope, ref tempCursor,
                     out findScope));
-                row = tempRef_row7.get();
+                row = tempReference_row7.get();
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 TypeArgument tupleType = c.<LayoutUniqueScope>TypeAs().FieldType(ref mapScope);
-                RefObject<RowBuffer> tempRef_row8 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_findScope =
-                    new RefObject<RowCursor>(findScope);
-                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().DeleteScope(tempRef_row8,
-                    tempRef_findScope));
-                findScope = tempRef_findScope.get();
-                row = tempRef_row8.get();
+                Reference<RowBuffer> tempReference_row8 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_findScope =
+                    new Reference<RowCursor>(findScope);
+                ResultAssert.IsSuccess(tupleType.<LayoutIndexedScope>TypeAs().DeleteScope(tempReference_row8,
+                    tempReference_findScope));
+                findScope = tempReference_findScope.get();
+                row = tempReference_row8.get();
             }
         }
     }
@@ -185,87 +186,87 @@ public final class TypedMapUnitTests {
     public void FindInMap() {
         RowBuffer row = new RowBuffer(TypedMapUnitTests.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
 
         Movie t1 = new Movie();
         t1.Cast = new HashMap<String, String>(Map.ofEntries(Map.entry("Mark", "Luke"), Map.entry("Harrison", "Han"),
             Map.entry("Carrie", "Leia")));
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc1 = RowCursor.Create(tempRef_row2);
-        row = tempRef_row2.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc1 =
-            new RefObject<RowCursor>(rc1);
-        this.WriteMovie(tempRef_row3, tempRef_rc1, t1);
-        rc1 = tempRef_rc1.get();
-        row = tempRef_row3.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc1 = RowCursor.Create(tempReference_row2);
+        row = tempReference_row2.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc1 =
+            new Reference<RowCursor>(rc1);
+        this.WriteMovie(tempReference_row3, tempReference_rc1, t1);
+        rc1 = tempReference_rc1.get();
+        row = tempReference_row3.get();
 
         // Attempt to find each item in turn.
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("cast", out c);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor mapScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out mapScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out mapScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref mapScope, out mapScope));
-        row = tempRef_row5.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref mapScope, out mapScope));
+        row = tempReference_row5.get();
         for (String key : t1.Cast.keySet()) {
             KeyValuePair<String, String> pair = new KeyValuePair<String, String>(key, "map lookup matches only on key");
-            RefObject<RowBuffer> tempRef_row6 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row6 =
+                new Reference<RowBuffer>(row);
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-            row = tempRef_row6.get();
-            RefObject<RowBuffer> tempRef_row7 =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowCursor> tempRef_tempCursor =
-                new RefObject<RowCursor>(tempCursor);
-            ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row7, tempRef_tempCursor, c.TypeArgs, pair));
-            tempCursor = tempRef_tempCursor.get();
-            row = tempRef_row7.get();
-            RefObject<RowBuffer> tempRef_row8 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+            row = tempReference_row6.get();
+            Reference<RowBuffer> tempReference_row7 =
+                new Reference<RowBuffer>(row);
+            Reference<RowCursor> tempReference_tempCursor =
+                new Reference<RowCursor>(tempCursor);
+            ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row7, tempReference_tempCursor, c.TypeArgs, pair));
+            tempCursor = tempReference_tempCursor.get();
+            row = tempReference_row7.get();
+            Reference<RowBuffer> tempReference_row8 =
+                new Reference<RowBuffer>(row);
             RowCursor findScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row8, ref mapScope, ref tempCursor,
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row8, ref mapScope, ref tempCursor,
                 out findScope));
-            row = tempRef_row8.get();
-            RefObject<RowBuffer> tempRef_row9 =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowCursor> tempRef_findScope =
-                new RefObject<RowCursor>(findScope);
+            row = tempReference_row8.get();
+            Reference<RowBuffer> tempReference_row9 =
+                new Reference<RowBuffer>(row);
+            Reference<RowCursor> tempReference_findScope =
+                new Reference<RowCursor>(findScope);
             KeyValuePair<String, String> foundPair;
-            OutObject<KeyValuePair<TKey, TValue>> tempOut_foundPair =
-                new OutObject<KeyValuePair<TKey, TValue>>();
-            ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempRef_row9, tempRef_findScope, c.TypeArgs,
+            Out<KeyValuePair<TKey, TValue>> tempOut_foundPair =
+                new Out<KeyValuePair<TKey, TValue>>();
+            ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempReference_row9, tempReference_findScope, c.TypeArgs,
                 tempOut_foundPair));
             foundPair = tempOut_foundPair.get();
-            findScope = tempRef_findScope.get();
-            row = tempRef_row9.get();
+            findScope = tempReference_findScope.get();
+            row = tempReference_row9.get();
             Assert.AreEqual(key, foundPair.Key, String.format("Failed to find t1.Cast[%1$s]", key));
         }
     }
@@ -285,10 +286,10 @@ public final class TypedMapUnitTests {
     public void PreventUniquenessViolations() {
         RowBuffer row = new RowBuffer(TypedMapUnitTests.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
 
         Movie t1 = new Movie();
         t1.Cast = new HashMap<String, String>(Map.ofEntries(Map.entry("Mark", "Luke")));
@@ -302,173 +303,173 @@ public final class TypedMapUnitTests {
         t1.Revenue = new HashMap<LocalDateTime, Earnings>(Map.ofEntries(Map.entry(LocalDateTime.parse("05/25/1977"),
             tempVar)));
 
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
-        RowCursor rc1 = RowCursor.Create(tempRef_row2);
-        row = tempRef_row2.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_rc1 =
-            new RefObject<RowCursor>(rc1);
-        this.WriteMovie(tempRef_row3, tempRef_rc1, t1);
-        rc1 = tempRef_rc1.get();
-        row = tempRef_row3.get();
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
+        RowCursor rc1 = RowCursor.Create(tempReference_row2);
+        row = tempReference_row2.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_rc1 =
+            new Reference<RowCursor>(rc1);
+        this.WriteMovie(tempReference_row3, tempReference_rc1, t1);
+        rc1 = tempReference_rc1.get();
+        row = tempReference_row3.get();
 
         // Attempt to insert duplicate items in existing sets.
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("cast", out c);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor mapScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out mapScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out mapScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref mapScope, out mapScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref mapScope, out mapScope));
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor =
-            new RefObject<RowCursor>(tempCursor);
-        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row7, tempRef_tempCursor, c.TypeArgs,
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor =
+            new Reference<RowCursor>(tempCursor);
+        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row7, tempReference_tempCursor, c.TypeArgs,
             KeyValuePair.Create("Mark", "Luke")));
-        tempCursor = tempRef_tempCursor.get();
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
+        tempCursor = tempReference_tempCursor.get();
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row8, ref mapScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row8, ref mapScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row9, Utf8String.Empty);
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor2 =
-            new RefObject<RowCursor>(tempCursor);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row9, Utf8String.Empty);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor2 =
+            new Reference<RowCursor>(tempCursor);
         KeyValuePair<String, String> _;
-        OutObject<KeyValuePair<TKey, TValue>> tempOut__ = new OutObject<KeyValuePair<TKey, TValue>>();
-        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempRef_row10, tempRef_tempCursor2, c.TypeArgs,
+        Out<KeyValuePair<TKey, TValue>> tempOut__ = new Out<KeyValuePair<TKey, TValue>>();
+        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempReference_row10, tempReference_tempCursor2, c.TypeArgs,
             tempOut__));
         _ = tempOut__.get();
-        tempCursor = tempRef_tempCursor2.get();
-        row = tempRef_row10.get();
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
+        tempCursor = tempReference_tempCursor2.get();
+        row = tempReference_row10.get();
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row11, Utf8String.Empty);
-        row = tempRef_row11.get();
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor3 =
-            new RefObject<RowCursor>(tempCursor);
-        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row12, tempRef_tempCursor3, c.TypeArgs,
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row11, Utf8String.Empty);
+        row = tempReference_row11.get();
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor3 =
+            new Reference<RowCursor>(tempCursor);
+        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row12, tempReference_tempCursor3, c.TypeArgs,
             KeyValuePair.Create("Mark", "Joker")));
-        tempCursor = tempRef_tempCursor3.get();
-        row = tempRef_row12.get();
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
+        tempCursor = tempReference_tempCursor3.get();
+        row = tempReference_row12.get();
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row13, ref mapScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row13, ref mapScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row13.get();
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row13.get();
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row14, Utf8String.Empty);
-        row = tempRef_row14.get();
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor4 =
-            new RefObject<RowCursor>(tempCursor);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row14, Utf8String.Empty);
+        row = tempReference_row14.get();
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor4 =
+            new Reference<RowCursor>(tempCursor);
         KeyValuePair<String, String> _;
-        OutObject<KeyValuePair<TKey, TValue>> tempOut__2 =
-            new OutObject<KeyValuePair<TKey, TValue>>();
-        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempRef_row15, tempRef_tempCursor4, c.TypeArgs,
+        Out<KeyValuePair<TKey, TValue>> tempOut__2 =
+            new Out<KeyValuePair<TKey, TValue>>();
+        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempReference_row15, tempReference_tempCursor4, c.TypeArgs,
             tempOut__2));
         _ = tempOut__2.get();
-        tempCursor = tempRef_tempCursor4.get();
-        row = tempRef_row15.get();
+        tempCursor = tempReference_tempCursor4.get();
+        row = tempReference_row15.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("stats", out c);
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out mapScope).Find(tempRef_row16, c.Path);
-        row = tempRef_row16.get();
-        RefObject<RowBuffer> tempRef_row17 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out mapScope).Find(tempReference_row16, c.Path);
+        row = tempReference_row16.get();
+        Reference<RowBuffer> tempReference_row17 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row17, ref mapScope, out mapScope));
-        row = tempRef_row17.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row17, ref mapScope, out mapScope));
+        row = tempReference_row17.get();
         KeyValuePair<UUID, Double> pair = KeyValuePair.Create(UUID.fromString("{4674962B-CE11-4916-81C5-0421EE36F168" +
             "}"), 11000000.00);
-        RefObject<RowBuffer> tempRef_row18 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row18 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row18, Utf8String.Empty);
-        row = tempRef_row18.get();
-        RefObject<RowBuffer> tempRef_row19 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor5 =
-            new RefObject<RowCursor>(tempCursor);
-        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row19, tempRef_tempCursor5, c.TypeArgs, pair));
-        tempCursor = tempRef_tempCursor5.get();
-        row = tempRef_row19.get();
-        RefObject<RowBuffer> tempRef_row20 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row18, Utf8String.Empty);
+        row = tempReference_row18.get();
+        Reference<RowBuffer> tempReference_row19 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor5 =
+            new Reference<RowCursor>(tempCursor);
+        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row19, tempReference_tempCursor5, c.TypeArgs, pair));
+        tempCursor = tempReference_tempCursor5.get();
+        row = tempReference_row19.get();
+        Reference<RowBuffer> tempReference_row20 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row20, ref mapScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row20, ref mapScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row20.get();
-        RefObject<RowBuffer> tempRef_row21 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row20.get();
+        Reference<RowBuffer> tempReference_row21 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row21, Utf8String.Empty);
-        row = tempRef_row21.get();
-        RefObject<RowBuffer> tempRef_row22 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor6 =
-            new RefObject<RowCursor>(tempCursor);
-        OutObject<KeyValuePair<TKey, TValue>> tempOut_pair = new OutObject<KeyValuePair<TKey,
-                    TValue>>();
-        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempRef_row22, tempRef_tempCursor6, c.TypeArgs,
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row21, Utf8String.Empty);
+        row = tempReference_row21.get();
+        Reference<RowBuffer> tempReference_row22 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor6 =
+            new Reference<RowCursor>(tempCursor);
+        Out<KeyValuePair<TKey, TValue>> tempOut_pair = new Out<KeyValuePair<TKey,
+                            TValue>>();
+        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempReference_row22, tempReference_tempCursor6, c.TypeArgs,
             tempOut_pair));
         pair = tempOut_pair.get();
-        tempCursor = tempRef_tempCursor6.get();
-        row = tempRef_row22.get();
+        tempCursor = tempReference_tempCursor6.get();
+        row = tempReference_row22.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -476,201 +477,201 @@ public final class TypedMapUnitTests {
     public void PreventUpdatesInNonUpdatableScope() {
         RowBuffer row = new RowBuffer(TypedMapUnitTests.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
 
         // Write a map and then try to write directly into it.
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("cast", out c);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor mapScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out mapScope).Find(tempRef_row2, c.Path);
-        row = tempRef_row2.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out mapScope).Find(tempReference_row2, c.Path);
+        row = tempReference_row2.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempRef_row3, ref mapScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempReference_row3, ref mapScope, c.TypeArgs,
             out mapScope));
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_mapScope =
-            new RefObject<RowCursor>(mapScope);
-        ResultAssert.InsufficientPermissions(TypedMapUnitTests.WriteKeyValue(tempRef_row4, tempRef_mapScope,
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_mapScope =
+            new Reference<RowCursor>(mapScope);
+        ResultAssert.InsufficientPermissions(TypedMapUnitTests.WriteKeyValue(tempReference_row4, tempReference_mapScope,
             c.TypeArgs, KeyValuePair.Create("Mark", "Joker")));
-        mapScope = tempRef_mapScope.get();
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        mapScope = tempReference_mapScope.get();
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row5, "cast.0");
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor =
-            new RefObject<RowCursor>(tempCursor);
-        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row6, tempRef_tempCursor, c.TypeArgs,
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row5, "cast.0");
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor =
+            new Reference<RowCursor>(tempCursor);
+        ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row6, tempReference_tempCursor, c.TypeArgs,
             KeyValuePair.Create("Mark", "Joker")));
-        tempCursor = tempRef_tempCursor.get();
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        tempCursor = tempReference_tempCursor.get();
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row7, ref mapScope, ref tempCursor));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row7, ref mapScope, ref tempCursor));
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row8, "cast.0");
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor2 =
-            new RefObject<RowCursor>(tempCursor);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row8, "cast.0");
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor2 =
+            new Reference<RowCursor>(tempCursor);
         KeyValuePair<String, String> _;
-        OutObject<KeyValuePair<TKey, TValue>> tempOut__ = new OutObject<KeyValuePair<TKey, TValue>>();
-        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempRef_row9, tempRef_tempCursor2, c.TypeArgs, tempOut__));
+        Out<KeyValuePair<TKey, TValue>> tempOut__ = new Out<KeyValuePair<TKey, TValue>>();
+        ResultAssert.NotFound(TypedMapUnitTests.ReadKeyValue(tempReference_row9, tempReference_tempCursor2, c.TypeArgs, tempOut__));
         _ = tempOut__.get();
-        tempCursor = tempRef_tempCursor2.get();
-        row = tempRef_row9.get();
+        tempCursor = tempReference_tempCursor2.get();
+        row = tempReference_row9.get();
 
         // Write a map of maps, successfully insert an empty map into it, and then try to write directly to the inner
         // map.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("related", out c);
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out mapScope).Find(tempRef_row10, c.Path);
-        row = tempRef_row10.get();
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out mapScope).Find(tempReference_row10, c.Path);
+        row = tempReference_row10.get();
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempRef_row11, ref mapScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempReference_row11, ref mapScope, c.TypeArgs,
             out mapScope));
-        row = tempRef_row11.get();
+        row = tempReference_row11.get();
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         LayoutIndexedScope tupleLayout =
             c.<LayoutUniqueScope>TypeAs().FieldType(ref mapScope).<LayoutIndexedScope>TypeAs();
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row12, "related.0");
-        row = tempRef_row12.get();
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row12, "related.0");
+        row = tempReference_row12.get();
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
         RowCursor tupleScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(tupleLayout.WriteScope(tempRef_row13, ref tempCursor, c.TypeArgs, out tupleScope));
-        row = tempRef_row13.get();
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(tupleLayout.WriteScope(tempReference_row13, ref tempCursor, c.TypeArgs, out tupleScope));
+        row = tempReference_row13.get();
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row14, ref tupleScope,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row14, ref tupleScope,
             "Mark"));
-        row = tempRef_row14.get();
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
-        assert tupleScope.MoveNext(tempRef_row15);
-        row = tempRef_row15.get();
+        row = tempReference_row14.get();
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
+        assert tupleScope.MoveNext(tempReference_row15);
+        row = tempReference_row15.get();
         TypeArgument valueType = c.TypeArgs[1];
         LayoutUniqueScope valueLayout = valueType.getType().<LayoutUniqueScope>TypeAs();
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
         RowCursor innerScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(valueLayout.WriteScope(tempRef_row16, ref tupleScope, valueType.getTypeArgs().clone(),
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(valueLayout.WriteScope(tempReference_row16, ref tupleScope, valueType.getTypeArgs().clone(),
             out innerScope));
-        row = tempRef_row16.get();
-        RefObject<RowBuffer> tempRef_row17 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row16.get();
+        Reference<RowBuffer> tempReference_row17 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row17, ref mapScope, ref tempCursor));
-        row = tempRef_row17.get();
-        RefObject<RowBuffer> tempRef_row18 =
-            new RefObject<RowBuffer>(row);
-        assert mapScope.MoveNext(tempRef_row18);
-        row = tempRef_row18.get();
-        RefObject<RowBuffer> tempRef_row19 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_mapScope2 =
-            new RefObject<RowCursor>(mapScope);
-        OutObject<RowCursor> tempOut_tupleScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(tupleLayout.ReadScope(tempRef_row19, tempRef_mapScope2, tempOut_tupleScope));
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row17, ref mapScope, ref tempCursor));
+        row = tempReference_row17.get();
+        Reference<RowBuffer> tempReference_row18 =
+            new Reference<RowBuffer>(row);
+        assert mapScope.MoveNext(tempReference_row18);
+        row = tempReference_row18.get();
+        Reference<RowBuffer> tempReference_row19 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_mapScope2 =
+            new Reference<RowCursor>(mapScope);
+        Out<RowCursor> tempOut_tupleScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(tupleLayout.ReadScope(tempReference_row19, tempReference_mapScope2, tempOut_tupleScope));
         tupleScope = tempOut_tupleScope.get();
-        mapScope = tempRef_mapScope2.get();
-        row = tempRef_row19.get();
-        RefObject<RowBuffer> tempRef_row20 =
-            new RefObject<RowBuffer>(row);
-        assert tupleScope.MoveNext(tempRef_row20);
-        row = tempRef_row20.get();
+        mapScope = tempReference_mapScope2.get();
+        row = tempReference_row19.get();
+        Reference<RowBuffer> tempReference_row20 =
+            new Reference<RowBuffer>(row);
+        assert tupleScope.MoveNext(tempReference_row20);
+        row = tempReference_row20.get();
 
         // Skip key.
-        RefObject<RowBuffer> tempRef_row21 =
-            new RefObject<RowBuffer>(row);
-        assert tupleScope.MoveNext(tempRef_row21);
-        row = tempRef_row21.get();
-        RefObject<RowBuffer> tempRef_row22 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tupleScope =
-            new RefObject<RowCursor>(tupleScope);
-        OutObject<RowCursor> tempOut_innerScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(valueLayout.ReadScope(tempRef_row22, tempRef_tupleScope, tempOut_innerScope));
+        Reference<RowBuffer> tempReference_row21 =
+            new Reference<RowBuffer>(row);
+        assert tupleScope.MoveNext(tempReference_row21);
+        row = tempReference_row21.get();
+        Reference<RowBuffer> tempReference_row22 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tupleScope =
+            new Reference<RowCursor>(tupleScope);
+        Out<RowCursor> tempOut_innerScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(valueLayout.ReadScope(tempReference_row22, tempReference_tupleScope, tempOut_innerScope));
         innerScope = tempOut_innerScope.get();
-        tupleScope = tempRef_tupleScope.get();
-        row = tempRef_row22.get();
+        tupleScope = tempReference_tupleScope.get();
+        row = tempReference_row22.get();
         TypeArgument itemType = valueType.getTypeArgs().get(0).clone();
-        RefObject<RowBuffer> tempRef_row23 =
-            new RefObject<RowBuffer>(row);
-        assert !innerScope.MoveNext(tempRef_row23);
-        row = tempRef_row23.get();
-        RefObject<RowBuffer> tempRef_row24 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_innerScope =
-            new RefObject<RowCursor>(innerScope);
-        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutInt64>TypeAs().WriteSparse(tempRef_row24,
-            tempRef_innerScope, 1));
-        innerScope = tempRef_innerScope.get();
-        row = tempRef_row24.get();
-        RefObject<RowBuffer> tempRef_row25 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_innerScope2 =
-            new RefObject<RowCursor>(innerScope);
-        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutInt64>TypeAs().DeleteSparse(tempRef_row25,
-            tempRef_innerScope2));
-        innerScope = tempRef_innerScope2.get();
-        row = tempRef_row25.get();
+        Reference<RowBuffer> tempReference_row23 =
+            new Reference<RowBuffer>(row);
+        assert !innerScope.MoveNext(tempReference_row23);
+        row = tempReference_row23.get();
+        Reference<RowBuffer> tempReference_row24 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_innerScope =
+            new Reference<RowCursor>(innerScope);
+        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutInt64>TypeAs().WriteSparse(tempReference_row24,
+            tempReference_innerScope, 1));
+        innerScope = tempReference_innerScope.get();
+        row = tempReference_row24.get();
+        Reference<RowBuffer> tempReference_row25 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_innerScope2 =
+            new Reference<RowCursor>(innerScope);
+        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutInt64>TypeAs().DeleteSparse(tempReference_row25,
+            tempReference_innerScope2));
+        innerScope = tempReference_innerScope2.get();
+        row = tempReference_row25.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -678,10 +679,10 @@ public final class TypedMapUnitTests {
     public void UpdateInMap() {
         RowBuffer row = new RowBuffer(TypedMapUnitTests.InitialRowSize);
         row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row);
-        row = tempRef_row.get();
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row);
+        row = tempReference_row.get();
 
         ArrayList<String> expected = new ArrayList<String>(Arrays.asList("Mark", "Harrison", "Carrie"));
 
@@ -689,289 +690,289 @@ public final class TypedMapUnitTests {
             Movie t1 = new Movie();
             t1.Cast = new HashMap<String, String>(Map.ofEntries(Map.entry("Mark", "Luke"), Map.entry("Harrison", "Han"
             ), Map.entry("Carrie", "Leia")));
-            RefObject<RowBuffer> tempRef_row2 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row2 =
+                new Reference<RowBuffer>(row);
             RowCursor _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            this.WriteMovie(tempRef_row2, root.Clone(out _), t1);
-            row = tempRef_row2.get();
+            this.WriteMovie(tempReference_row2, root.Clone(out _), t1);
+            row = tempReference_row2.get();
 
             // Attempt to find each item in turn and then delete it.
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("cast", out c);
-            RefObject<RowBuffer> tempRef_row3 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row3 =
+                new Reference<RowBuffer>(row);
             RowCursor mapScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out mapScope).Find(tempRef_row3, c.Path);
-            row = tempRef_row3.get();
-            RefObject<RowBuffer> tempRef_row4 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out mapScope).Find(tempReference_row3, c.Path);
+            row = tempReference_row3.get();
+            Reference<RowBuffer> tempReference_row4 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row4, ref mapScope, out mapScope));
-            row = tempRef_row4.get();
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row4, ref mapScope, out mapScope));
+            row = tempReference_row4.get();
             for (String key : permutation) {
                 // Verify it is already there.
                 KeyValuePair<String, String> pair = new KeyValuePair<String, String>(key, "map lookup matches only on" +
                     " key");
-                RefObject<RowBuffer> tempRef_row5 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row5 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row5, Utf8String.Empty);
-                row = tempRef_row5.get();
-                RefObject<RowBuffer> tempRef_row6 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row6, tempRef_tempCursor, c.TypeArgs,
+                root.Clone(out tempCursor).Find(tempReference_row5, Utf8String.Empty);
+                row = tempReference_row5.get();
+                Reference<RowBuffer> tempReference_row6 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row6, tempReference_tempCursor, c.TypeArgs,
                     pair));
-                tempCursor = tempRef_tempCursor.get();
-                row = tempRef_row6.get();
-                RefObject<RowBuffer> tempRef_row7 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor.get();
+                row = tempReference_row6.get();
+                Reference<RowBuffer> tempReference_row7 =
+                    new Reference<RowBuffer>(row);
                 RowCursor findScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row7, ref mapScope, ref tempCursor,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row7, ref mapScope, ref tempCursor,
                     out findScope));
-                row = tempRef_row7.get();
+                row = tempReference_row7.get();
 
                 // Insert it again with update.
                 KeyValuePair<String, String> updatePair = new KeyValuePair<String, String>(key, "update value");
-                RefObject<RowBuffer> tempRef_row8 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row8 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row8, Utf8String.Empty);
-                row = tempRef_row8.get();
-                RefObject<RowBuffer> tempRef_row9 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor2 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row9, tempRef_tempCursor2, c.TypeArgs,
+                root.Clone(out tempCursor).Find(tempReference_row8, Utf8String.Empty);
+                row = tempReference_row8.get();
+                Reference<RowBuffer> tempReference_row9 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor2 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row9, tempReference_tempCursor2, c.TypeArgs,
                     updatePair));
-                tempCursor = tempRef_tempCursor2.get();
-                row = tempRef_row9.get();
-                RefObject<RowBuffer> tempRef_row10 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor2.get();
+                row = tempReference_row9.get();
+                Reference<RowBuffer> tempReference_row10 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row10, ref mapScope,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row10, ref mapScope,
                     ref tempCursor, UpdateOptions.Update));
-                row = tempRef_row10.get();
+                row = tempReference_row10.get();
 
                 // Verify that the value was updated.
-                RefObject<RowBuffer> tempRef_row11 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row11 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row11, Utf8String.Empty);
-                row = tempRef_row11.get();
-                RefObject<RowBuffer> tempRef_row12 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor3 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row12, tempRef_tempCursor3, c.TypeArgs
+                root.Clone(out tempCursor).Find(tempReference_row11, Utf8String.Empty);
+                row = tempReference_row11.get();
+                Reference<RowBuffer> tempReference_row12 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor3 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row12, tempReference_tempCursor3, c.TypeArgs
                     , pair));
-                tempCursor = tempRef_tempCursor3.get();
-                row = tempRef_row12.get();
-                RefObject<RowBuffer> tempRef_row13 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor3.get();
+                row = tempReference_row12.get();
+                Reference<RowBuffer> tempReference_row13 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row13, ref mapScope, ref tempCursor
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row13, ref mapScope, ref tempCursor
                     , out findScope));
-                row = tempRef_row13.get();
-                RefObject<RowBuffer> tempRef_row14 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_findScope =
-                    new RefObject<RowCursor>(findScope);
+                row = tempReference_row13.get();
+                Reference<RowBuffer> tempReference_row14 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_findScope =
+                    new Reference<RowCursor>(findScope);
                 KeyValuePair<String, String> foundPair;
-                OutObject<KeyValuePair<TKey, TValue>> tempOut_foundPair =
-                    new OutObject<KeyValuePair<TKey, TValue>>();
-                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempRef_row14, tempRef_findScope, c.TypeArgs,
+                Out<KeyValuePair<TKey, TValue>> tempOut_foundPair =
+                    new Out<KeyValuePair<TKey, TValue>>();
+                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempReference_row14, tempReference_findScope, c.TypeArgs,
                     tempOut_foundPair));
                 foundPair = tempOut_foundPair.get();
-                findScope = tempRef_findScope.get();
-                row = tempRef_row14.get();
+                findScope = tempReference_findScope.get();
+                row = tempReference_row14.get();
                 assert key == foundPair.Key;
                 assert updatePair.Value == foundPair.Value;
 
                 // Insert it again with upsert.
                 updatePair = new KeyValuePair<String, String>(key, "upsert value");
-                RefObject<RowBuffer> tempRef_row15 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row15 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row15, Utf8String.Empty);
-                row = tempRef_row15.get();
-                RefObject<RowBuffer> tempRef_row16 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor4 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row16, tempRef_tempCursor4, c.TypeArgs
+                root.Clone(out tempCursor).Find(tempReference_row15, Utf8String.Empty);
+                row = tempReference_row15.get();
+                Reference<RowBuffer> tempReference_row16 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor4 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row16, tempReference_tempCursor4, c.TypeArgs
                     , updatePair));
-                tempCursor = tempRef_tempCursor4.get();
-                row = tempRef_row16.get();
+                tempCursor = tempReference_tempCursor4.get();
+                row = tempReference_row16.get();
 
                 // ReSharper disable once RedundantArgumentDefaultValue
-                RefObject<RowBuffer> tempRef_row17 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row17 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row17, ref mapScope,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row17, ref mapScope,
                     ref tempCursor, UpdateOptions.Upsert));
-                row = tempRef_row17.get();
+                row = tempReference_row17.get();
 
                 // Verify that the value was upserted.
-                RefObject<RowBuffer> tempRef_row18 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row18 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row18, Utf8String.Empty);
-                row = tempRef_row18.get();
-                RefObject<RowBuffer> tempRef_row19 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor5 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row19, tempRef_tempCursor5, c.TypeArgs
+                root.Clone(out tempCursor).Find(tempReference_row18, Utf8String.Empty);
+                row = tempReference_row18.get();
+                Reference<RowBuffer> tempReference_row19 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor5 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row19, tempReference_tempCursor5, c.TypeArgs
                     , pair));
-                tempCursor = tempRef_tempCursor5.get();
-                row = tempRef_row19.get();
-                RefObject<RowBuffer> tempRef_row20 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor5.get();
+                row = tempReference_row19.get();
+                Reference<RowBuffer> tempReference_row20 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row20, ref mapScope, ref tempCursor
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row20, ref mapScope, ref tempCursor
                     , out findScope));
-                row = tempRef_row20.get();
-                RefObject<RowBuffer> tempRef_row21 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_findScope2 =
-                    new RefObject<RowCursor>(findScope);
-                OutObject<KeyValuePair<TKey, TValue>> tempOut_foundPair2 =
-                    new OutObject<KeyValuePair<TKey, TValue>>();
-                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempRef_row21, tempRef_findScope2, c.TypeArgs,
+                row = tempReference_row20.get();
+                Reference<RowBuffer> tempReference_row21 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_findScope2 =
+                    new Reference<RowCursor>(findScope);
+                Out<KeyValuePair<TKey, TValue>> tempOut_foundPair2 =
+                    new Out<KeyValuePair<TKey, TValue>>();
+                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(tempReference_row21, tempReference_findScope2, c.TypeArgs,
                     tempOut_foundPair2));
                 foundPair = tempOut_foundPair2.get();
-                findScope = tempRef_findScope2.get();
-                row = tempRef_row21.get();
+                findScope = tempReference_findScope2.get();
+                row = tempReference_row21.get();
                 assert key == foundPair.Key;
                 assert updatePair.Value == foundPair.Value;
 
                 // Insert it again with insert (fail: exists).
                 updatePair = new KeyValuePair<String, String>(key, "insert value");
-                RefObject<RowBuffer> tempRef_row22 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row22 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row22, Utf8String.Empty);
-                row = tempRef_row22.get();
-                RefObject<RowBuffer> tempRef_row23 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor6 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row23, tempRef_tempCursor6, c.TypeArgs
+                root.Clone(out tempCursor).Find(tempReference_row22, Utf8String.Empty);
+                row = tempReference_row22.get();
+                Reference<RowBuffer> tempReference_row23 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor6 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row23, tempReference_tempCursor6, c.TypeArgs
                     , updatePair));
-                tempCursor = tempRef_tempCursor6.get();
-                row = tempRef_row23.get();
-                RefObject<RowBuffer> tempRef_row24 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor6.get();
+                row = tempReference_row23.get();
+                Reference<RowBuffer> tempReference_row24 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row24, ref mapScope,
+                ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row24, ref mapScope,
                     ref tempCursor, UpdateOptions.Insert));
-                row = tempRef_row24.get();
+                row = tempReference_row24.get();
 
                 // Insert it again with insert at (fail: disallowed).
                 updatePair = new KeyValuePair<String, String>(key, "insertAt value");
-                RefObject<RowBuffer> tempRef_row25 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row25 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row25, Utf8String.Empty);
-                row = tempRef_row25.get();
-                RefObject<RowBuffer> tempRef_row26 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor7 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempRef_row26, tempRef_tempCursor7, c.TypeArgs
+                root.Clone(out tempCursor).Find(tempReference_row25, Utf8String.Empty);
+                row = tempReference_row25.get();
+                Reference<RowBuffer> tempReference_row26 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor7 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(tempReference_row26, tempReference_tempCursor7, c.TypeArgs
                     , updatePair));
-                tempCursor = tempRef_tempCursor7.get();
-                row = tempRef_row26.get();
-                RefObject<RowBuffer> tempRef_row27 =
-                    new RefObject<RowBuffer>(row);
+                tempCursor = tempReference_tempCursor7.get();
+                row = tempReference_row26.get();
+                Reference<RowBuffer> tempReference_row27 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.TypeConstraint(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row27, ref mapScope,
+                ResultAssert.TypeConstraint(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row27, ref mapScope,
                     ref tempCursor, UpdateOptions.InsertAt));
-                row = tempRef_row27.get();
+                row = tempReference_row27.get();
             }
         }
     }
 
-    private static Earnings ReadEarnings(RefObject<RowBuffer> row, RefObject<RowCursor> udtScope) {
+    private static Earnings ReadEarnings(Reference<RowBuffer> row, Reference<RowCursor> udtScope) {
         Layout udt = udtScope.get().getLayout();
         Earnings m = new Earnings();
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert udt.TryFind("domestic", out c);
-        OutObject<BigDecimal> tempOut_Domestic = new OutObject<BigDecimal>();
+        Out<BigDecimal> tempOut_Domestic = new Out<BigDecimal>();
         ResultAssert.IsSuccess(c.<LayoutDecimal>TypeAs().ReadFixed(row, udtScope, c, tempOut_Domestic));
         m.Domestic = tempOut_Domestic.get();
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert udt.TryFind("worldwide", out c);
-        OutObject<BigDecimal> tempOut_Worldwide = new OutObject<BigDecimal>();
+        Out<BigDecimal> tempOut_Worldwide = new Out<BigDecimal>();
         ResultAssert.IsSuccess(c.<LayoutDecimal>TypeAs().ReadFixed(row, udtScope, c, tempOut_Worldwide));
         m.Worldwide = tempOut_Worldwide.get();
         return m;
     }
 
-    private static <TKey, TValue> Result ReadKeyValue(RefObject<RowBuffer> row,
-                                                      RefObject<RowCursor> scope, TypeArgumentList typeArgs,
-                                                      OutObject<KeyValuePair<TKey, TValue>> pair) {
+    private static <TKey, TValue> Result ReadKeyValue(Reference<RowBuffer> row,
+                                                      Reference<RowCursor> scope, TypeArgumentList typeArgs,
+                                                      Out<KeyValuePair<TKey, TValue>> pair) {
         pair.set(null);
         LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
         RowCursor tupleScope;
-        OutObject<RowCursor> tempOut_tupleScope =
-            new OutObject<RowCursor>();
+        Out<RowCursor> tempOut_tupleScope =
+            new Out<RowCursor>();
         Result r = tupleLayout.ReadScope(row, scope, tempOut_tupleScope);
         tupleScope = tempOut_tupleScope.get();
         if (r != Result.Success) {
@@ -979,25 +980,25 @@ public final class TypedMapUnitTests {
         }
 
         tupleScope.MoveNext(row);
-        RefObject<RowCursor> tempRef_tupleScope =
-            new RefObject<RowCursor>(tupleScope);
+        Reference<RowCursor> tempReference_tupleScope =
+            new Reference<RowCursor>(tupleScope);
         TKey key;
-        OutObject<TKey> tempOut_key = new OutObject<TKey>();
-        r = typeArgs.get(0).getType().<LayoutType<TKey>>TypeAs().ReadSparse(row, tempRef_tupleScope, tempOut_key);
+        Out<TKey> tempOut_key = new Out<TKey>();
+        r = typeArgs.get(0).getType().<LayoutType<TKey>>TypeAs().ReadSparse(row, tempReference_tupleScope, tempOut_key);
         key = tempOut_key.get();
-        tupleScope = tempRef_tupleScope.get();
+        tupleScope = tempReference_tupleScope.get();
         if (r != Result.Success) {
             return r;
         }
 
         tupleScope.MoveNext(row);
-        RefObject<RowCursor> tempRef_tupleScope2 =
-            new RefObject<RowCursor>(tupleScope);
+        Reference<RowCursor> tempReference_tupleScope2 =
+            new Reference<RowCursor>(tupleScope);
         TValue value;
-        OutObject<TValue> tempOut_value = new OutObject<TValue>();
-        r = typeArgs.get(1).getType().<LayoutType<TValue>>TypeAs().ReadSparse(row, tempRef_tupleScope2, tempOut_value);
+        Out<TValue> tempOut_value = new Out<TValue>();
+        r = typeArgs.get(1).getType().<LayoutType<TValue>>TypeAs().ReadSparse(row, tempReference_tupleScope2, tempOut_value);
         value = tempOut_value.get();
-        tupleScope = tempRef_tupleScope2.get();
+        tupleScope = tempReference_tupleScope2.get();
         if (r != Result.Success) {
             return r;
         }
@@ -1006,75 +1007,75 @@ public final class TypedMapUnitTests {
         return Result.Success;
     }
 
-    private Movie ReadMovie(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Movie ReadMovie(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Movie value = new Movie();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("cast", out c);
         RowCursor castScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out castScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref castScope, out castScope) == Result.Success) {
             value.Cast = new HashMap<String, String>();
             while (castScope.MoveNext(row)) {
-                RefObject<RowCursor> tempRef_castScope =
-                    new RefObject<RowCursor>(castScope);
+                Reference<RowCursor> tempReference_castScope =
+                    new Reference<RowCursor>(castScope);
                 KeyValuePair<String, String> item;
-                OutObject<KeyValuePair<TKey, TValue>> tempOut_item =
-                    new OutObject<KeyValuePair<TKey, TValue>>();
-                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempRef_castScope, c.TypeArgs,
+                Out<KeyValuePair<TKey, TValue>> tempOut_item =
+                    new Out<KeyValuePair<TKey, TValue>>();
+                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempReference_castScope, c.TypeArgs,
                     tempOut_item));
                 item = tempOut_item.get();
-                castScope = tempRef_castScope.get();
+                castScope = tempReference_castScope.get();
                 value.Cast.put(item.Key, item.Value);
             }
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("stats", out c);
         RowCursor statsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out statsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref statsScope, out statsScope) == Result.Success) {
             value.Stats = new HashMap<UUID, Double>();
             while (statsScope.MoveNext(row)) {
-                RefObject<RowCursor> tempRef_statsScope =
-                    new RefObject<RowCursor>(statsScope);
+                Reference<RowCursor> tempReference_statsScope =
+                    new Reference<RowCursor>(statsScope);
                 KeyValuePair<java.util.UUID, Double> item;
-                OutObject<KeyValuePair<TKey, TValue>> tempOut_item2 =
-                    new OutObject<KeyValuePair<TKey, TValue>>();
-                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempRef_statsScope, c.TypeArgs,
+                Out<KeyValuePair<TKey, TValue>> tempOut_item2 =
+                    new Out<KeyValuePair<TKey, TValue>>();
+                ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempReference_statsScope, c.TypeArgs,
                     tempOut_item2));
                 item = tempOut_item2.get();
-                statsScope = tempRef_statsScope.get();
+                statsScope = tempReference_statsScope.get();
                 value.Stats.put(item.Key, item.Value);
             }
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("related", out c);
         RowCursor relatedScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out relatedScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref relatedScope, out relatedScope) == Result.Success) {
             value.Related = new HashMap<String, HashMap<Long, String>>();
             TypeArgument keyType = c.TypeArgs[0];
@@ -1083,42 +1084,42 @@ public final class TypedMapUnitTests {
             LayoutUniqueScope valueLayout = valueType.getType().<LayoutUniqueScope>TypeAs();
             while (relatedScope.MoveNext(row)) {
                 LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
-                RefObject<RowCursor> tempRef_relatedScope =
-                    new RefObject<RowCursor>(relatedScope);
+                Reference<RowCursor> tempReference_relatedScope =
+                    new Reference<RowCursor>(relatedScope);
                 RowCursor tupleScope;
-                OutObject<RowCursor> tempOut_tupleScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(tupleLayout.ReadScope(row, tempRef_relatedScope, tempOut_tupleScope));
+                Out<RowCursor> tempOut_tupleScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(tupleLayout.ReadScope(row, tempReference_relatedScope, tempOut_tupleScope));
                 tupleScope = tempOut_tupleScope.get();
-                relatedScope = tempRef_relatedScope.get();
+                relatedScope = tempReference_relatedScope.get();
                 assert tupleScope.MoveNext(row);
                 String itemKey;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(keyLayout.ReadSparse(row, ref tupleScope, out itemKey));
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor itemValueScope;
-                OutObject<RowCursor> tempOut_itemValueScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(valueLayout.ReadScope(row, tempRef_tupleScope, tempOut_itemValueScope));
+                Out<RowCursor> tempOut_itemValueScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(valueLayout.ReadScope(row, tempReference_tupleScope, tempOut_itemValueScope));
                 itemValueScope = tempOut_itemValueScope.get();
-                tupleScope = tempRef_tupleScope.get();
+                tupleScope = tempReference_tupleScope.get();
                 HashMap<Long, String> itemValue = new HashMap<Long, String>();
                 while (itemValueScope.MoveNext(row)) {
-                    RefObject<RowCursor> tempRef_itemValueScope = new RefObject<RowCursor>(itemValueScope);
+                    Reference<RowCursor> tempReference_itemValueScope = new Reference<RowCursor>(itemValueScope);
                     KeyValuePair<Long, String> innerItem;
-                    OutObject<KeyValuePair<TKey, TValue>> tempOut_innerItem =
-                        new OutObject<KeyValuePair<TKey, TValue>>();
-                    ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempRef_itemValueScope,
+                    Out<KeyValuePair<TKey, TValue>> tempOut_innerItem =
+                        new Out<KeyValuePair<TKey, TValue>>();
+                    ResultAssert.IsSuccess(TypedMapUnitTests.ReadKeyValue(row, tempReference_itemValueScope,
                         valueType.getTypeArgs().clone(), tempOut_innerItem));
                     innerItem = tempOut_innerItem.get();
-                    itemValueScope = tempRef_itemValueScope.get();
+                    itemValueScope = tempReference_itemValueScope.get();
                     itemValue.put(innerItem.Key, innerItem.Value);
                 }
 
@@ -1127,16 +1128,16 @@ public final class TypedMapUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("revenue", out c);
         RowCursor revenueScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out revenueScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref revenueScope, out revenueScope) == Result.Success) {
             value.Revenue = new HashMap<LocalDateTime, Earnings>();
             TypeArgument keyType = c.TypeArgs[0];
@@ -1145,31 +1146,31 @@ public final class TypedMapUnitTests {
             LayoutUDT valueLayout = valueType.getType().<LayoutUDT>TypeAs();
             while (revenueScope.MoveNext(row)) {
                 LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
-                RefObject<RowCursor> tempRef_revenueScope =
-                    new RefObject<RowCursor>(revenueScope);
+                Reference<RowCursor> tempReference_revenueScope =
+                    new Reference<RowCursor>(revenueScope);
                 RowCursor tupleScope;
-                OutObject<RowCursor> tempOut_tupleScope2 =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(tupleLayout.ReadScope(row, tempRef_revenueScope, tempOut_tupleScope2));
+                Out<RowCursor> tempOut_tupleScope2 =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(tupleLayout.ReadScope(row, tempReference_revenueScope, tempOut_tupleScope2));
                 tupleScope = tempOut_tupleScope2.get();
-                revenueScope = tempRef_revenueScope.get();
+                revenueScope = tempReference_revenueScope.get();
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope2 = new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope2 = new Reference<RowCursor>(tupleScope);
                 java.time.LocalDateTime itemKey;
-                OutObject<LocalDateTime> tempOut_itemKey = new OutObject<LocalDateTime>();
-                ResultAssert.IsSuccess(keyLayout.ReadSparse(row, tempRef_tupleScope2, tempOut_itemKey));
+                Out<LocalDateTime> tempOut_itemKey = new Out<LocalDateTime>();
+                ResultAssert.IsSuccess(keyLayout.ReadSparse(row, tempReference_tupleScope2, tempOut_itemKey));
                 itemKey = tempOut_itemKey.get();
-                tupleScope = tempRef_tupleScope2.get();
+                tupleScope = tempReference_tupleScope2.get();
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope3 = new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope3 = new Reference<RowCursor>(tupleScope);
                 RowCursor itemValueScope;
-                OutObject<RowCursor> tempOut_itemValueScope2 = new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(valueLayout.ReadScope(row, tempRef_tupleScope3, tempOut_itemValueScope2));
+                Out<RowCursor> tempOut_itemValueScope2 = new Out<RowCursor>();
+                ResultAssert.IsSuccess(valueLayout.ReadScope(row, tempReference_tupleScope3, tempOut_itemValueScope2));
                 itemValueScope = tempOut_itemValueScope2.get();
-                tupleScope = tempRef_tupleScope3.get();
-                RefObject<RowCursor> tempRef_itemValueScope2 = new RefObject<RowCursor>(itemValueScope);
-                Earnings itemValue = TypedMapUnitTests.ReadEarnings(row, tempRef_itemValueScope2);
-                itemValueScope = tempRef_itemValueScope2.get();
+                tupleScope = tempReference_tupleScope3.get();
+                Reference<RowCursor> tempReference_itemValueScope2 = new Reference<RowCursor>(itemValueScope);
+                Earnings itemValue = TypedMapUnitTests.ReadEarnings(row, tempReference_itemValueScope2);
+                itemValueScope = tempReference_itemValueScope2.get();
 
                 value.Revenue.put(itemKey, itemValue);
             }
@@ -1178,142 +1179,142 @@ public final class TypedMapUnitTests {
         return value;
     }
 
-    private static void WriteEarnings(RefObject<RowBuffer> row, RefObject<RowCursor> udtScope, TypeArgumentList typeArgs, Earnings m) {
+    private static void WriteEarnings(Reference<RowBuffer> row, Reference<RowCursor> udtScope, TypeArgumentList typeArgs, Earnings m) {
         Layout udt = row.get().getResolver().Resolve(typeArgs.getSchemaId().clone());
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert udt.TryFind("domestic", out c);
         ResultAssert.IsSuccess(c.<LayoutDecimal>TypeAs().WriteFixed(row, udtScope, c, m.Domestic));
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert udt.TryFind("worldwide", out c);
         ResultAssert.IsSuccess(c.<LayoutDecimal>TypeAs().WriteFixed(row, udtScope, c, m.Worldwide));
     }
 
-    private static <TKey, TValue> Result WriteKeyValue(RefObject<RowBuffer> row,
-                                                       RefObject<RowCursor> scope, TypeArgumentList typeArgs, KeyValuePair<TKey, TValue> pair) {
+    private static <TKey, TValue> Result WriteKeyValue(Reference<RowBuffer> row,
+                                                       Reference<RowCursor> scope, TypeArgumentList typeArgs, KeyValuePair<TKey, TValue> pair) {
         LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
         RowCursor tupleScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         Result r = tupleLayout.WriteScope(row, scope, typeArgs.clone(), out tupleScope);
         if (r != Result.Success) {
             return r;
         }
 
-        RefObject<RowCursor> tempRef_tupleScope =
-            new RefObject<RowCursor>(tupleScope);
-        r = typeArgs.get(0).getType().<LayoutType<TKey>>TypeAs().WriteSparse(row, tempRef_tupleScope, pair.Key);
-        tupleScope = tempRef_tupleScope.get();
+        Reference<RowCursor> tempReference_tupleScope =
+            new Reference<RowCursor>(tupleScope);
+        r = typeArgs.get(0).getType().<LayoutType<TKey>>TypeAs().WriteSparse(row, tempReference_tupleScope, pair.Key);
+        tupleScope = tempReference_tupleScope.get();
         if (r != Result.Success) {
             return r;
         }
 
         tupleScope.MoveNext(row);
-        RefObject<RowCursor> tempRef_tupleScope2 =
-            new RefObject<RowCursor>(tupleScope);
-        r = typeArgs.get(1).getType().<LayoutType<TValue>>TypeAs().WriteSparse(row, tempRef_tupleScope2, pair.Value);
-        tupleScope = tempRef_tupleScope2.get();
+        Reference<RowCursor> tempReference_tupleScope2 =
+            new Reference<RowCursor>(tupleScope);
+        r = typeArgs.get(1).getType().<LayoutType<TValue>>TypeAs().WriteSparse(row, tempReference_tupleScope2, pair.Value);
+        tupleScope = tempReference_tupleScope2.get();
         return r;
     }
 
-    private void WriteMovie(RefObject<RowBuffer> row, RefObject<RowCursor> root, Movie value) {
+    private void WriteMovie(Reference<RowBuffer> row, Reference<RowCursor> root, Movie value) {
         LayoutColumn c;
 
         if (value.Cast != null) {
-            OutObject<LayoutColumn> tempOut_c =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("cast", tempOut_c);
             c = tempOut_c.get();
             RowCursor castScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out castScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref castScope,
                 c.getTypeArgs().clone(), out castScope));
             for (KeyValuePair<String, String> item : value.Cast) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
-                RefObject<RowCursor> tempRef_tempCursor =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempRef_tempCursor,
+                Reference<RowCursor> tempReference_tempCursor =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempReference_tempCursor,
                     c.getTypeArgs().clone(), item));
-                tempCursor = tempRef_tempCursor.get();
-                RefObject<RowCursor> tempRef_castScope =
-                    new RefObject<RowCursor>(castScope);
-                RefObject<RowCursor> tempRef_tempCursor2 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_castScope,
-                    tempRef_tempCursor2));
-                tempCursor = tempRef_tempCursor2.get();
-                castScope = tempRef_castScope.get();
+                tempCursor = tempReference_tempCursor.get();
+                Reference<RowCursor> tempReference_castScope =
+                    new Reference<RowCursor>(castScope);
+                Reference<RowCursor> tempReference_tempCursor2 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_castScope,
+                    tempReference_tempCursor2));
+                tempCursor = tempReference_tempCursor2.get();
+                castScope = tempReference_castScope.get();
             }
         }
 
         if (value.Stats != null) {
-            OutObject<LayoutColumn> tempOut_c2 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c2 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("stats", tempOut_c2);
             c = tempOut_c2.get();
             RowCursor statsScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out statsScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref statsScope,
                 c.getTypeArgs().clone(), out statsScope));
             for (KeyValuePair<UUID, Double> item : value.Stats) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
-                RefObject<RowCursor> tempRef_tempCursor3 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempRef_tempCursor3,
+                Reference<RowCursor> tempReference_tempCursor3 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempReference_tempCursor3,
                     c.getTypeArgs().clone(), item));
-                tempCursor = tempRef_tempCursor3.get();
-                RefObject<RowCursor> tempRef_statsScope =
-                    new RefObject<RowCursor>(statsScope);
-                RefObject<RowCursor> tempRef_tempCursor4 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_statsScope,
-                    tempRef_tempCursor4));
-                tempCursor = tempRef_tempCursor4.get();
-                statsScope = tempRef_statsScope.get();
+                tempCursor = tempReference_tempCursor3.get();
+                Reference<RowCursor> tempReference_statsScope =
+                    new Reference<RowCursor>(statsScope);
+                Reference<RowCursor> tempReference_tempCursor4 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_statsScope,
+                    tempReference_tempCursor4));
+                tempCursor = tempReference_tempCursor4.get();
+                statsScope = tempReference_statsScope.get();
             }
         }
 
         if (value.Related != null) {
-            OutObject<LayoutColumn> tempOut_c3 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c3 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("related", tempOut_c3);
             c = tempOut_c3.get();
             RowCursor relatedScoped;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out relatedScoped).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref relatedScoped,
                 c.getTypeArgs().clone(), out relatedScoped));
@@ -1323,20 +1324,20 @@ public final class TypedMapUnitTests {
                 LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
                 RowCursor tempCursor1;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor1).Find(row, "related.0");
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(tupleLayout.WriteScope(row, ref tempCursor1, c.getTypeArgs().clone(),
                     out tupleScope));
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.getTypeArgs().get(0).getType().<LayoutUtf8>TypeAs().WriteSparse(row,
                     ref tupleScope, item.Key));
@@ -1345,58 +1346,59 @@ public final class TypedMapUnitTests {
                 LayoutUniqueScope valueLayout = valueType.getType().<LayoutUniqueScope>TypeAs();
                 RowCursor innerScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(valueLayout.WriteScope(row, ref tupleScope, valueType.getTypeArgs().clone(),
                     out innerScope));
                 for (KeyValuePair<Long, String> innerItem : item.Value) {
                     RowCursor tempCursor2;
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword
-                    // - these cannot be converted using the 'OutObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Out' helper class unless the method is within the
                     // code being modified:
                     root.get().Clone(out tempCursor2).Find(row, "related.0.0");
-                    RefObject<RowCursor> tempRef_tempCursor2
-                        = new RefObject<RowCursor>(tempCursor2);
-                    ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempRef_tempCursor2,
+                    Reference<RowCursor> tempReference_tempCursor2
+                        = new Reference<RowCursor>(tempCursor2);
+                    ResultAssert.IsSuccess(TypedMapUnitTests.WriteKeyValue(row, tempReference_tempCursor2,
                         valueType.getTypeArgs().clone(), innerItem));
-                    tempCursor2 = tempRef_tempCursor2.get();
-                    RefObject<RowCursor> tempRef_innerScope =
-                        new RefObject<RowCursor>(innerScope);
-                    RefObject<RowCursor> tempRef_tempCursor22 = new RefObject<RowCursor>(tempCursor2);
-                    ResultAssert.IsSuccess(valueLayout.MoveField(row, tempRef_innerScope, tempRef_tempCursor22));
-                    tempCursor2 = tempRef_tempCursor22.get();
-                    innerScope = tempRef_innerScope.get();
+                    tempCursor2 = tempReference_tempCursor2.get();
+                    Reference<RowCursor> tempReference_innerScope =
+                        new Reference<RowCursor>(innerScope);
+                    Reference<RowCursor> tempReference_tempCursor22 = new Reference<RowCursor>(tempCursor2);
+                    ResultAssert.IsSuccess(valueLayout.MoveField(row, tempReference_innerScope,
+                        tempReference_tempCursor22));
+                    tempCursor2 = tempReference_tempCursor22.get();
+                    innerScope = tempReference_innerScope.get();
                 }
 
-                RefObject<RowCursor> tempRef_relatedScoped =
-                    new RefObject<RowCursor>(relatedScoped);
-                RefObject<RowCursor> tempRef_tempCursor1 =
-                    new RefObject<RowCursor>(tempCursor1);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_relatedScoped,
-                    tempRef_tempCursor1));
-                tempCursor1 = tempRef_tempCursor1.get();
-                relatedScoped = tempRef_relatedScoped.get();
+                Reference<RowCursor> tempReference_relatedScoped =
+                    new Reference<RowCursor>(relatedScoped);
+                Reference<RowCursor> tempReference_tempCursor1 =
+                    new Reference<RowCursor>(tempCursor1);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_relatedScoped,
+                    tempReference_tempCursor1));
+                tempCursor1 = tempReference_tempCursor1.get();
+                relatedScoped = tempReference_relatedScoped.get();
             }
         }
 
         if (value.Revenue != null) {
-            OutObject<LayoutColumn> tempOut_c4 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c4 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("revenue", tempOut_c4);
             c = tempOut_c4.get();
             RowCursor revenueScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out revenueScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref revenueScope,
                 c.getTypeArgs().clone(), out revenueScope));
@@ -1406,48 +1408,48 @@ public final class TypedMapUnitTests {
                 LayoutIndexedScope tupleLayout = LayoutType.TypedTuple;
                 RowCursor tempCursor1;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor1).Find(row, "revenue.0");
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(tupleLayout.WriteScope(row, ref tempCursor1, c.getTypeArgs().clone(),
                     out tupleScope));
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
                 ResultAssert.IsSuccess(c.getTypeArgs().get(0).getType().<LayoutDateTime>TypeAs().WriteSparse(row,
-                    tempRef_tupleScope, item.Key));
-                tupleScope = tempRef_tupleScope.get();
+                    tempReference_tupleScope, item.Key));
+                tupleScope = tempReference_tupleScope.get();
                 assert tupleScope.MoveNext(row);
                 TypeArgument valueType = c.getTypeArgs().get(1).clone();
                 LayoutUDT valueLayout = valueType.getType().<LayoutUDT>TypeAs();
-                RefObject<RowCursor> tempRef_tupleScope2 =
-                    new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope2 =
+                    new Reference<RowCursor>(tupleScope);
                 RowCursor itemScope;
-                OutObject<RowCursor> tempOut_itemScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(valueLayout.WriteScope(row, tempRef_tupleScope2,
+                Out<RowCursor> tempOut_itemScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(valueLayout.WriteScope(row, tempReference_tupleScope2,
                     valueType.getTypeArgs().clone(), tempOut_itemScope));
                 itemScope = tempOut_itemScope.get();
-                tupleScope = tempRef_tupleScope2.get();
-                RefObject<RowCursor> tempRef_itemScope =
-                    new RefObject<RowCursor>(itemScope);
-                TypedMapUnitTests.WriteEarnings(row, tempRef_itemScope, valueType.getTypeArgs().clone(), item.Value);
-                itemScope = tempRef_itemScope.get();
+                tupleScope = tempReference_tupleScope2.get();
+                Reference<RowCursor> tempReference_itemScope =
+                    new Reference<RowCursor>(itemScope);
+                TypedMapUnitTests.WriteEarnings(row, tempReference_itemScope, valueType.getTypeArgs().clone(), item.Value);
+                itemScope = tempReference_itemScope.get();
 
-                RefObject<RowCursor> tempRef_revenueScope =
-                    new RefObject<RowCursor>(revenueScope);
-                RefObject<RowCursor> tempRef_tempCursor12 =
-                    new RefObject<RowCursor>(tempCursor1);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_revenueScope,
-                    tempRef_tempCursor12));
-                tempCursor1 = tempRef_tempCursor12.get();
-                revenueScope = tempRef_revenueScope.get();
+                Reference<RowCursor> tempReference_revenueScope =
+                    new Reference<RowCursor>(revenueScope);
+                Reference<RowCursor> tempReference_tempCursor12 =
+                    new Reference<RowCursor>(tempCursor1);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_revenueScope,
+                    tempReference_tempCursor12));
+                tempCursor1 = tempReference_tempCursor12.get();
+                revenueScope = tempReference_revenueScope.get();
             }
         }
     }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedSetUnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedSetUnitTests.java
index 57eef83..7913edf 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedSetUnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/TypedSetUnitTests.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.HybridRowVersion;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
@@ -59,26 +60,26 @@ public final class TypedSetUnitTests {
         t1.Work = new ArrayList<Tuple<Boolean, Long>>(Arrays.asList(Tuple.Create(false, 10000), Tuple.Create(true,
             49053), Tuple.Create(false, 53111)));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteTodo(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteTodo(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        Todo t2 = this.ReadTodo(tempRef_row3, RowCursor.Create(tempRef_row4, out _));
-        row = tempRef_row4.get();
-        row = tempRef_row3.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        Todo t2 = this.ReadTodo(tempReference_row3, RowCursor.Create(tempReference_row4, out _));
+        row = tempReference_row4.get();
+        row = tempReference_row3.get();
         assert t1 == t2;
     }
 
@@ -96,83 +97,83 @@ public final class TypedSetUnitTests {
             Todo t1 = new Todo();
             t1.Projects = new ArrayList<UUID>(permutation);
 
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowBuffer> tempRef_row2 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row2 =
+                new Reference<RowBuffer>(row);
             RowCursor _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            this.WriteTodo(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-            row = tempRef_row2.get();
-            row = tempRef_row.get();
+            this.WriteTodo(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+            row = tempReference_row2.get();
+            row = tempReference_row.get();
 
             // Attempt to update each item in turn and then update it with itself.
-            RefObject<RowBuffer> tempRef_row3 =
-                new RefObject<RowBuffer>(row);
-            RowCursor root = RowCursor.Create(tempRef_row3);
-            row = tempRef_row3.get();
+            Reference<RowBuffer> tempReference_row3 =
+                new Reference<RowBuffer>(row);
+            RowCursor root = RowCursor.Create(tempReference_row3);
+            row = tempReference_row3.get();
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("projects", out c);
-            RefObject<RowBuffer> tempRef_row4 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row4 =
+                new Reference<RowBuffer>(row);
             RowCursor setScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out setScope).Find(tempRef_row4, c.Path);
-            row = tempRef_row4.get();
-            RefObject<RowBuffer> tempRef_row5 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out setScope).Find(tempReference_row4, c.Path);
+            row = tempReference_row4.get();
+            Reference<RowBuffer> tempReference_row5 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref setScope, out setScope));
-            row = tempRef_row5.get();
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref setScope, out setScope));
+            row = tempReference_row5.get();
             for (UUID p : t1.Projects) {
-                RefObject<RowBuffer> tempRef_row6 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row6 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-                row = tempRef_row6.get();
-                RefObject<RowBuffer> tempRef_row7 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+                row = tempReference_row6.get();
+                Reference<RowBuffer> tempReference_row7 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row7,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row7,
                     ref tempCursor, p));
-                row = tempRef_row7.get();
-                RefObject<RowBuffer> tempRef_row8 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row7.get();
+                Reference<RowBuffer> tempReference_row8 =
+                    new Reference<RowBuffer>(row);
                 RowCursor findScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row8, ref setScope, ref tempCursor,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row8, ref setScope, ref tempCursor,
                     out findScope));
-                row = tempRef_row8.get();
-                RefObject<RowBuffer> tempRef_row9 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row8.get();
+                Reference<RowBuffer> tempReference_row9 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().DeleteSparse(tempRef_row9,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().DeleteSparse(tempReference_row9,
                     ref findScope));
-                row = tempRef_row9.get();
+                row = tempReference_row9.get();
             }
         }
 
@@ -189,155 +190,156 @@ public final class TypedSetUnitTests {
         t1.Prices = new ArrayList<ArrayList<Float>>(Arrays.asList(new ArrayList<Float>(Arrays.asList(1.2F, 3.0F)),
             new ArrayList<Float>(Arrays.asList(4.1F, 5.7F)), new ArrayList<Float>(Arrays.asList(7.3F, 8.12F, 9.14F))));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteTodo(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteTodo(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         // Attempt to find each item in turn.
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row3);
-        row = tempRef_row3.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row3);
+        row = tempReference_row3.get();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("attendees", out c);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor setScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref setScope, out setScope));
-        row = tempRef_row5.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref setScope, out setScope));
+        row = tempReference_row5.get();
         for (int i = 0; i < t1.Attendees.size(); i++) {
-            RefObject<RowBuffer> tempRef_row6 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row6 =
+                new Reference<RowBuffer>(row);
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-            row = tempRef_row6.get();
-            RefObject<RowBuffer> tempRef_row7 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+            row = tempReference_row6.get();
+            Reference<RowBuffer> tempReference_row7 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref tempCursor,
+            ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref tempCursor,
                 t1.Attendees.get(i)));
-            row = tempRef_row7.get();
-            RefObject<RowBuffer> tempRef_row8 =
-                new RefObject<RowBuffer>(row);
+            row = tempReference_row7.get();
+            Reference<RowBuffer> tempReference_row8 =
+                new Reference<RowBuffer>(row);
             RowCursor findScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row8, ref setScope, ref tempCursor,
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row8, ref setScope, ref tempCursor,
                 out findScope));
-            row = tempRef_row8.get();
+            row = tempReference_row8.get();
             Assert.AreEqual(i, findScope.Index, String.format("Failed to find t1.Attendees[%1$s]", i));
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("prices", out c);
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row9, c.Path);
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row9, c.Path);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row10, ref setScope, out setScope));
-        row = tempRef_row10.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row10, ref setScope, out setScope));
+        row = tempReference_row10.get();
         TypeArgument innerType = c.TypeArgs[0];
         TypeArgument itemType = innerType.getTypeArgs().get(0).clone();
         LayoutUniqueScope innerLayout = innerType.getType().<LayoutUniqueScope>TypeAs();
         for (int i = 0; i < t1.Prices.size(); i++) {
-            RefObject<RowBuffer> tempRef_row11 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row11 =
+                new Reference<RowBuffer>(row);
             RowCursor tempCursor1;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out tempCursor1).Find(tempRef_row11, Utf8String.Empty);
-            row = tempRef_row11.get();
-            RefObject<RowBuffer> tempRef_row12 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out tempCursor1).Find(tempReference_row11, Utf8String.Empty);
+            row = tempReference_row11.get();
+            Reference<RowBuffer> tempReference_row12 =
+                new Reference<RowBuffer>(row);
             RowCursor innerScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(innerLayout.WriteScope(tempRef_row12, ref tempCursor1,
+            ResultAssert.IsSuccess(innerLayout.WriteScope(tempReference_row12, ref tempCursor1,
                 innerType.getTypeArgs().clone(), out innerScope));
-            row = tempRef_row12.get();
+            row = tempReference_row12.get();
             for (int j = 0; j < t1.Prices.get(i).size(); j++) {
-                RefObject<RowBuffer> tempRef_row13 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row13 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor2;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor2).Find(tempRef_row13, "prices.0.0");
-                row = tempRef_row13.get();
-                RefObject<RowBuffer> tempRef_row14 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_tempCursor2 =
-                    new RefObject<RowCursor>(tempCursor2);
-                ResultAssert.IsSuccess(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempRef_row14,
-                    tempRef_tempCursor2, t1.Prices.get(i).get(j)));
-                tempCursor2 = tempRef_tempCursor2.get();
-                row = tempRef_row14.get();
-                RefObject<RowBuffer> tempRef_row15 =
-                    new RefObject<RowBuffer>(row);
-                RefObject<RowCursor> tempRef_innerScope =
-                    new RefObject<RowCursor>(innerScope);
-                RefObject<RowCursor> tempRef_tempCursor22 =
-                    new RefObject<RowCursor>(tempCursor2);
-                ResultAssert.IsSuccess(innerLayout.MoveField(tempRef_row15, tempRef_innerScope, tempRef_tempCursor22));
-                tempCursor2 = tempRef_tempCursor22.get();
-                innerScope = tempRef_innerScope.get();
-                row = tempRef_row15.get();
+                root.Clone(out tempCursor2).Find(tempReference_row13, "prices.0.0");
+                row = tempReference_row13.get();
+                Reference<RowBuffer> tempReference_row14 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_tempCursor2 =
+                    new Reference<RowCursor>(tempCursor2);
+                ResultAssert.IsSuccess(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempReference_row14,
+                    tempReference_tempCursor2, t1.Prices.get(i).get(j)));
+                tempCursor2 = tempReference_tempCursor2.get();
+                row = tempReference_row14.get();
+                Reference<RowBuffer> tempReference_row15 =
+                    new Reference<RowBuffer>(row);
+                Reference<RowCursor> tempReference_innerScope =
+                    new Reference<RowCursor>(innerScope);
+                Reference<RowCursor> tempReference_tempCursor22 =
+                    new Reference<RowCursor>(tempCursor2);
+                ResultAssert.IsSuccess(innerLayout.MoveField(tempReference_row15, tempReference_innerScope,
+                    tempReference_tempCursor22));
+                tempCursor2 = tempReference_tempCursor22.get();
+                innerScope = tempReference_innerScope.get();
+                row = tempReference_row15.get();
             }
 
-            RefObject<RowBuffer> tempRef_row16 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row16 =
+                new Reference<RowBuffer>(row);
             RowCursor findScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row16, ref setScope, ref tempCursor1,
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row16, ref setScope, ref tempCursor1,
                 out findScope));
-            row = tempRef_row16.get();
+            row = tempReference_row16.get();
             Assert.AreEqual(i, findScope.Index, String.format("Failed to find t1.Prices[%1$s]", i));
         }
     }
@@ -370,326 +372,326 @@ public final class TypedSetUnitTests {
         //ORIGINAL LINE: t1.Work = new List<Tuple<bool, ulong>> { Tuple.Create(false, 10000UL)};
         t1.Work = new ArrayList<Tuple<Boolean, Long>>(Arrays.asList(Tuple.Create(false, 10000)));
 
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        this.WriteTodo(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        this.WriteTodo(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
 
         // Attempt to insert duplicate items in existing sets.
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
-        RowCursor root = RowCursor.Create(tempRef_row3);
-        row = tempRef_row3.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
+        RowCursor root = RowCursor.Create(tempReference_row3);
+        row = tempReference_row3.get();
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("attendees", out c);
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         RowCursor setScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row4, c.Path);
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row4, c.Path);
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref setScope, out setScope));
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref setScope, out setScope));
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-        row = tempRef_row6.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+        row = tempReference_row6.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref tempCursor,
             t1.Attendees.get(0)));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row8, ref setScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row8, ref setScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row9, Utf8String.Empty);
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row9, Utf8String.Empty);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row10, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row10, ref tempCursor,
             t1.Attendees.get(0)));
-        row = tempRef_row10.get();
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row10.get();
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
         RowCursor _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row11, ref setScope, ref tempCursor, out _));
-        row = tempRef_row11.get();
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row11, ref setScope, ref tempCursor, out _));
+        row = tempReference_row11.get();
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row12, Utf8String.Empty);
-        row = tempRef_row12.get();
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row12, Utf8String.Empty);
+        row = tempReference_row12.get();
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
         String _;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.NotFound(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(tempRef_row13, ref tempCursor, out _));
-        row = tempRef_row13.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.NotFound(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(tempReference_row13, ref tempCursor, out _));
+        row = tempReference_row13.get();
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("projects", out c);
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row14, c.Path);
-        row = tempRef_row14.get();
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row14, c.Path);
+        row = tempReference_row14.get();
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row15, ref setScope, out setScope));
-        row = tempRef_row15.get();
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row15, ref setScope, out setScope));
+        row = tempReference_row15.get();
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row16, Utf8String.Empty);
-        row = tempRef_row16.get();
-        RefObject<RowBuffer> tempRef_row17 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row16, Utf8String.Empty);
+        row = tempReference_row16.get();
+        Reference<RowBuffer> tempReference_row17 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row17, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row17, ref tempCursor,
             t1.Projects.get(0)));
-        row = tempRef_row17.get();
-        RefObject<RowBuffer> tempRef_row18 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row17.get();
+        Reference<RowBuffer> tempReference_row18 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row18, ref setScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row18, ref setScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row18.get();
+        row = tempReference_row18.get();
 
         // Attempt to move a duplicate set into a set of sets.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("prices", out c);
-        RefObject<RowBuffer> tempRef_row19 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row19 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row19, c.Path);
-        row = tempRef_row19.get();
-        RefObject<RowBuffer> tempRef_row20 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row19, c.Path);
+        row = tempReference_row19.get();
+        Reference<RowBuffer> tempReference_row20 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row20, ref setScope, out setScope));
-        row = tempRef_row20.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row20, ref setScope, out setScope));
+        row = tempReference_row20.get();
         TypeArgument innerType = c.TypeArgs[0];
         LayoutUniqueScope innerLayout = innerType.getType().<LayoutUniqueScope>TypeAs();
-        RefObject<RowBuffer> tempRef_row21 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row21 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor1;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor1).Find(tempRef_row21, Utf8String.Empty);
-        row = tempRef_row21.get();
-        RefObject<RowBuffer> tempRef_row22 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor1).Find(tempReference_row21, Utf8String.Empty);
+        row = tempReference_row21.get();
+        Reference<RowBuffer> tempReference_row22 =
+            new Reference<RowBuffer>(row);
         RowCursor innerScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(innerLayout.WriteScope(tempRef_row22, ref tempCursor1, innerType.getTypeArgs().clone()
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(innerLayout.WriteScope(tempReference_row22, ref tempCursor1, innerType.getTypeArgs().clone()
             , out innerScope));
-        row = tempRef_row22.get();
+        row = tempReference_row22.get();
         for (float innerItem : t1.Prices.get(0)) {
             LayoutFloat32 itemLayout = innerType.getTypeArgs().get(0).getType().<LayoutFloat32>TypeAs();
-            RefObject<RowBuffer> tempRef_row23 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row23 =
+                new Reference<RowBuffer>(row);
             RowCursor tempCursor2;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out tempCursor2).Find(tempRef_row23, "prices.0.0");
-            row = tempRef_row23.get();
-            RefObject<RowBuffer> tempRef_row24 =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowCursor> tempRef_tempCursor2 =
-                new RefObject<RowCursor>(tempCursor2);
-            ResultAssert.IsSuccess(itemLayout.WriteSparse(tempRef_row24, tempRef_tempCursor2, innerItem));
-            tempCursor2 = tempRef_tempCursor2.get();
-            row = tempRef_row24.get();
-            RefObject<RowBuffer> tempRef_row25 =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowCursor> tempRef_innerScope =
-                new RefObject<RowCursor>(innerScope);
-            RefObject<RowCursor> tempRef_tempCursor22 =
-                new RefObject<RowCursor>(tempCursor2);
-            ResultAssert.IsSuccess(innerLayout.MoveField(tempRef_row25, tempRef_innerScope, tempRef_tempCursor22));
-            tempCursor2 = tempRef_tempCursor22.get();
-            innerScope = tempRef_innerScope.get();
-            row = tempRef_row25.get();
+            root.Clone(out tempCursor2).Find(tempReference_row23, "prices.0.0");
+            row = tempReference_row23.get();
+            Reference<RowBuffer> tempReference_row24 =
+                new Reference<RowBuffer>(row);
+            Reference<RowCursor> tempReference_tempCursor2 =
+                new Reference<RowCursor>(tempCursor2);
+            ResultAssert.IsSuccess(itemLayout.WriteSparse(tempReference_row24, tempReference_tempCursor2, innerItem));
+            tempCursor2 = tempReference_tempCursor2.get();
+            row = tempReference_row24.get();
+            Reference<RowBuffer> tempReference_row25 =
+                new Reference<RowBuffer>(row);
+            Reference<RowCursor> tempReference_innerScope =
+                new Reference<RowCursor>(innerScope);
+            Reference<RowCursor> tempReference_tempCursor22 =
+                new Reference<RowCursor>(tempCursor2);
+            ResultAssert.IsSuccess(innerLayout.MoveField(tempReference_row25, tempReference_innerScope, tempReference_tempCursor22));
+            tempCursor2 = tempReference_tempCursor22.get();
+            innerScope = tempReference_innerScope.get();
+            row = tempReference_row25.get();
         }
 
-        RefObject<RowBuffer> tempRef_row26 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row26 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row26, ref setScope, ref tempCursor1,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row26, ref setScope, ref tempCursor1,
             UpdateOptions.Insert));
-        row = tempRef_row26.get();
+        row = tempReference_row26.get();
 
         // Attempt to move a duplicate UDT into a set of UDT.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("shopping", out c);
-        RefObject<RowBuffer> tempRef_row27 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row27 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row27, c.Path);
-        row = tempRef_row27.get();
-        RefObject<RowBuffer> tempRef_row28 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row27, c.Path);
+        row = tempReference_row27.get();
+        Reference<RowBuffer> tempReference_row28 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row28, ref setScope, out setScope));
-        row = tempRef_row28.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row28, ref setScope, out setScope));
+        row = tempReference_row28.get();
         LayoutUDT udtLayout = c.TypeArgs[0].Type.<LayoutUDT>TypeAs();
-        RefObject<RowBuffer> tempRef_row29 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row29 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row29, Utf8String.Empty);
-        row = tempRef_row29.get();
-        RefObject<RowBuffer> tempRef_row30 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor =
-            new RefObject<RowCursor>(tempCursor);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row29, Utf8String.Empty);
+        row = tempReference_row29.get();
+        Reference<RowBuffer> tempReference_row30 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor =
+            new Reference<RowCursor>(tempCursor);
         RowCursor udtScope;
-        OutObject<RowCursor> tempOut_udtScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(udtLayout.WriteScope(tempRef_row30, tempRef_tempCursor, c.TypeArgs[0].TypeArgs,
+        Out<RowCursor> tempOut_udtScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(udtLayout.WriteScope(tempReference_row30, tempReference_tempCursor, c.TypeArgs[0].TypeArgs,
             tempOut_udtScope));
         udtScope = tempOut_udtScope.get();
-        tempCursor = tempRef_tempCursor.get();
-        row = tempRef_row30.get();
-        RefObject<RowBuffer> tempRef_row31 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_udtScope =
-            new RefObject<RowCursor>(udtScope);
-        TypedSetUnitTests.WriteShoppingItem(tempRef_row31, tempRef_udtScope, c.TypeArgs[0].TypeArgs,
+        tempCursor = tempReference_tempCursor.get();
+        row = tempReference_row30.get();
+        Reference<RowBuffer> tempReference_row31 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_udtScope =
+            new Reference<RowCursor>(udtScope);
+        TypedSetUnitTests.WriteShoppingItem(tempReference_row31, tempReference_udtScope, c.TypeArgs[0].TypeArgs,
             t1.Shopping.get(0));
-        udtScope = tempRef_udtScope.get();
-        row = tempRef_row31.get();
-        RefObject<RowBuffer> tempRef_row32 =
-            new RefObject<RowBuffer>(row);
+        udtScope = tempReference_udtScope.get();
+        row = tempReference_row31.get();
+        Reference<RowBuffer> tempReference_row32 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row32, ref setScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row32, ref setScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row32.get();
+        row = tempReference_row32.get();
 
         // Attempt to move a duplicate tuple into a set of tuple.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("work", out c);
-        RefObject<RowBuffer> tempRef_row33 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row33 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out setScope).Find(tempRef_row33, c.Path);
-        row = tempRef_row33.get();
-        RefObject<RowBuffer> tempRef_row34 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out setScope).Find(tempReference_row33, c.Path);
+        row = tempReference_row33.get();
+        Reference<RowBuffer> tempReference_row34 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row34, ref setScope, out setScope));
-        row = tempRef_row34.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row34, ref setScope, out setScope));
+        row = tempReference_row34.get();
         innerType = c.TypeArgs[0];
         LayoutIndexedScope tupleLayout = innerType.getType().<LayoutIndexedScope>TypeAs();
-        RefObject<RowBuffer> tempRef_row35 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row35 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        root.Clone(out tempCursor).Find(tempRef_row35, Utf8String.Empty);
-        row = tempRef_row35.get();
-        RefObject<RowBuffer> tempRef_row36 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        root.Clone(out tempCursor).Find(tempReference_row35, Utf8String.Empty);
+        row = tempReference_row35.get();
+        Reference<RowBuffer> tempReference_row36 =
+            new Reference<RowBuffer>(row);
         RowCursor tupleScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(tupleLayout.WriteScope(tempRef_row36, ref tempCursor, innerType.getTypeArgs().clone(),
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(tupleLayout.WriteScope(tempReference_row36, ref tempCursor, innerType.getTypeArgs().clone(),
             out tupleScope));
-        row = tempRef_row36.get();
-        RefObject<RowBuffer> tempRef_row37 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tupleScope =
-            new RefObject<RowCursor>(tupleScope);
-        ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().WriteSparse(tempRef_row37, tempRef_tupleScope, t1.Work.get(0).Item1));
-        tupleScope = tempRef_tupleScope.get();
-        row = tempRef_row37.get();
-        RefObject<RowBuffer> tempRef_row38 =
-            new RefObject<RowBuffer>(row);
-        assert tupleScope.MoveNext(tempRef_row38);
-        row = tempRef_row38.get();
-        RefObject<RowBuffer> tempRef_row39 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tupleScope2 =
-            new RefObject<RowCursor>(tupleScope);
-        ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().WriteSparse(tempRef_row39, tempRef_tupleScope2, t1.Work.get(0).Item2));
-        tupleScope = tempRef_tupleScope2.get();
-        row = tempRef_row39.get();
-        RefObject<RowBuffer> tempRef_row40 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row36.get();
+        Reference<RowBuffer> tempReference_row37 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tupleScope =
+            new Reference<RowCursor>(tupleScope);
+        ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().WriteSparse(tempReference_row37, tempReference_tupleScope, t1.Work.get(0).Item1));
+        tupleScope = tempReference_tupleScope.get();
+        row = tempReference_row37.get();
+        Reference<RowBuffer> tempReference_row38 =
+            new Reference<RowBuffer>(row);
+        assert tupleScope.MoveNext(tempReference_row38);
+        row = tempReference_row38.get();
+        Reference<RowBuffer> tempReference_row39 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tupleScope2 =
+            new Reference<RowCursor>(tupleScope);
+        ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().WriteSparse(tempReference_row39, tempReference_tupleScope2, t1.Work.get(0).Item2));
+        tupleScope = tempReference_tupleScope2.get();
+        row = tempReference_row39.get();
+        Reference<RowBuffer> tempReference_row40 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row40, ref setScope, ref tempCursor,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row40, ref setScope, ref tempCursor,
             UpdateOptions.Insert));
-        row = tempRef_row40.get();
+        row = tempReference_row40.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -701,181 +703,181 @@ public final class TypedSetUnitTests {
         // Write a set and then try to write directly into it.
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("attendees", out c);
-        RefObject<RowBuffer> tempRef_row =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row2 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row2 =
+            new Reference<RowBuffer>(row);
         RowCursor setScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row, out setScope).Find(tempRef_row2, c.Path);
-        row = tempRef_row2.get();
-        row = tempRef_row.get();
-        RefObject<RowBuffer> tempRef_row3 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row, out setScope).Find(tempReference_row2, c.Path);
+        row = tempReference_row2.get();
+        row = tempReference_row.get();
+        Reference<RowBuffer> tempReference_row3 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempRef_row3, ref setScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempReference_row3, ref setScope, c.TypeArgs,
             out setScope));
-        row = tempRef_row3.get();
-        RefObject<RowBuffer> tempRef_row4 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row3.get();
+        Reference<RowBuffer> tempReference_row4 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.InsufficientPermissions(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row4,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.InsufficientPermissions(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row4,
             ref setScope, "foo"));
-        row = tempRef_row4.get();
-        RefObject<RowBuffer> tempRef_row5 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row6 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row4.get();
+        Reference<RowBuffer> tempReference_row5 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row6 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row5, out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-        row = tempRef_row6.get();
-        row = tempRef_row5.get();
-        RefObject<RowBuffer> tempRef_row7 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row5, out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+        row = tempReference_row6.get();
+        row = tempReference_row5.get();
+        Reference<RowBuffer> tempReference_row7 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row7, ref tempCursor, "foo"
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row7, ref tempCursor, "foo"
         ));
-        row = tempRef_row7.get();
-        RefObject<RowBuffer> tempRef_row8 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row7.get();
+        Reference<RowBuffer> tempReference_row8 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row8, ref setScope, ref tempCursor));
-        row = tempRef_row8.get();
-        RefObject<RowBuffer> tempRef_row9 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row8, ref setScope, ref tempCursor));
+        row = tempReference_row8.get();
+        Reference<RowBuffer> tempReference_row9 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.InsufficientPermissions(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempRef_row9,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.InsufficientPermissions(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().WriteSparse(tempReference_row9,
             ref setScope, "foo"));
-        row = tempRef_row9.get();
-        RefObject<RowBuffer> tempRef_row10 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row9.get();
+        Reference<RowBuffer> tempReference_row10 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().DeleteSparse(tempRef_row10, ref setScope));
-        row = tempRef_row10.get();
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().DeleteSparse(tempReference_row10, ref setScope));
+        row = tempReference_row10.get();
 
         // Write a set of sets, successfully insert an empty set into it, and then try to write directly to the inner
         // set.
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("prices", out c);
-        RefObject<RowBuffer> tempRef_row11 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row12 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row11 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row12 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row11, out setScope).Find(tempRef_row12, c.Path);
-        row = tempRef_row12.get();
-        row = tempRef_row11.get();
-        RefObject<RowBuffer> tempRef_row13 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row11, out setScope).Find(tempReference_row12, c.Path);
+        row = tempReference_row12.get();
+        row = tempReference_row11.get();
+        Reference<RowBuffer> tempReference_row13 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempRef_row13, ref setScope, c.TypeArgs,
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(tempReference_row13, ref setScope, c.TypeArgs,
             out setScope));
-        row = tempRef_row13.get();
+        row = tempReference_row13.get();
         TypeArgument innerType = c.TypeArgs[0];
         TypeArgument itemType = innerType.getTypeArgs().get(0).clone();
         LayoutUniqueScope innerLayout = innerType.getType().<LayoutUniqueScope>TypeAs();
-        RefObject<RowBuffer> tempRef_row14 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row15 =
-            new RefObject<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row14 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row15 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor1;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row14, out tempCursor1).Find(tempRef_row15, "prices.0");
-        row = tempRef_row15.get();
-        row = tempRef_row14.get();
-        RefObject<RowBuffer> tempRef_row16 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row14, out tempCursor1).Find(tempReference_row15, "prices.0");
+        row = tempReference_row15.get();
+        row = tempReference_row14.get();
+        Reference<RowBuffer> tempReference_row16 =
+            new Reference<RowBuffer>(row);
         RowCursor innerScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(innerLayout.WriteScope(tempRef_row16, ref tempCursor1, innerType.getTypeArgs().clone()
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(innerLayout.WriteScope(tempReference_row16, ref tempCursor1, innerType.getTypeArgs().clone()
             , out innerScope));
-        row = tempRef_row16.get();
-        RefObject<RowBuffer> tempRef_row17 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowBuffer> tempRef_row18 =
-            new RefObject<RowBuffer>(row);
+        row = tempReference_row16.get();
+        Reference<RowBuffer> tempReference_row17 =
+            new Reference<RowBuffer>(row);
+        Reference<RowBuffer> tempReference_row18 =
+            new Reference<RowBuffer>(row);
         RowCursor tempCursor2;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        RowCursor.Create(tempRef_row17, out tempCursor2).Find(tempRef_row18, "prices.0.0");
-        row = tempRef_row18.get();
-        row = tempRef_row17.get();
-        RefObject<RowBuffer> tempRef_row19 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_tempCursor2 =
-            new RefObject<RowCursor>(tempCursor2);
-        ResultAssert.IsSuccess(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempRef_row19,
-            tempRef_tempCursor2, 1.0F));
-        tempCursor2 = tempRef_tempCursor2.get();
-        row = tempRef_row19.get();
-        RefObject<RowBuffer> tempRef_row20 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_innerScope =
-            new RefObject<RowCursor>(innerScope);
-        RefObject<RowCursor> tempRef_tempCursor22 =
-            new RefObject<RowCursor>(tempCursor2);
-        ResultAssert.IsSuccess(innerLayout.MoveField(tempRef_row20, tempRef_innerScope, tempRef_tempCursor22));
-        tempCursor2 = tempRef_tempCursor22.get();
-        innerScope = tempRef_innerScope.get();
-        row = tempRef_row20.get();
-        RefObject<RowBuffer> tempRef_row21 =
-            new RefObject<RowBuffer>(row);
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        RowCursor.Create(tempReference_row17, out tempCursor2).Find(tempReference_row18, "prices.0.0");
+        row = tempReference_row18.get();
+        row = tempReference_row17.get();
+        Reference<RowBuffer> tempReference_row19 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_tempCursor2 =
+            new Reference<RowCursor>(tempCursor2);
+        ResultAssert.IsSuccess(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempReference_row19,
+            tempReference_tempCursor2, 1.0F));
+        tempCursor2 = tempReference_tempCursor2.get();
+        row = tempReference_row19.get();
+        Reference<RowBuffer> tempReference_row20 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_innerScope =
+            new Reference<RowCursor>(innerScope);
+        Reference<RowCursor> tempReference_tempCursor22 =
+            new Reference<RowCursor>(tempCursor2);
+        ResultAssert.IsSuccess(innerLayout.MoveField(tempReference_row20, tempReference_innerScope, tempReference_tempCursor22));
+        tempCursor2 = tempReference_tempCursor22.get();
+        innerScope = tempReference_innerScope.get();
+        row = tempReference_row20.get();
+        Reference<RowBuffer> tempReference_row21 =
+            new Reference<RowBuffer>(row);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row21, ref setScope, ref tempCursor1));
-        row = tempRef_row21.get();
-        RefObject<RowBuffer> tempRef_row22 =
-            new RefObject<RowBuffer>(row);
-        assert setScope.MoveNext(tempRef_row22);
-        row = tempRef_row22.get();
-        RefObject<RowBuffer> tempRef_row23 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_setScope =
-            new RefObject<RowCursor>(setScope);
-        OutObject<RowCursor> tempOut_innerScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(innerLayout.ReadScope(tempRef_row23, tempRef_setScope, tempOut_innerScope));
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row21, ref setScope, ref tempCursor1));
+        row = tempReference_row21.get();
+        Reference<RowBuffer> tempReference_row22 =
+            new Reference<RowBuffer>(row);
+        assert setScope.MoveNext(tempReference_row22);
+        row = tempReference_row22.get();
+        Reference<RowBuffer> tempReference_row23 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_setScope =
+            new Reference<RowCursor>(setScope);
+        Out<RowCursor> tempOut_innerScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(innerLayout.ReadScope(tempReference_row23, tempReference_setScope, tempOut_innerScope));
         innerScope = tempOut_innerScope.get();
-        setScope = tempRef_setScope.get();
-        row = tempRef_row23.get();
-        RefObject<RowBuffer> tempRef_row24 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_innerScope2 =
-            new RefObject<RowCursor>(innerScope);
-        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempRef_row24,
-            tempRef_innerScope2, 1.0F));
-        innerScope = tempRef_innerScope2.get();
-        row = tempRef_row24.get();
-        RefObject<RowBuffer> tempRef_row25 =
-            new RefObject<RowBuffer>(row);
-        RefObject<RowCursor> tempRef_innerScope3 =
-            new RefObject<RowCursor>(innerScope);
-        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutFloat32>TypeAs().DeleteSparse(tempRef_row25,
-            tempRef_innerScope3));
-        innerScope = tempRef_innerScope3.get();
-        row = tempRef_row25.get();
+        setScope = tempReference_setScope.get();
+        row = tempReference_row23.get();
+        Reference<RowBuffer> tempReference_row24 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_innerScope2 =
+            new Reference<RowCursor>(innerScope);
+        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutFloat32>TypeAs().WriteSparse(tempReference_row24,
+            tempReference_innerScope2, 1.0F));
+        innerScope = tempReference_innerScope2.get();
+        row = tempReference_row24.get();
+        Reference<RowBuffer> tempReference_row25 =
+            new Reference<RowBuffer>(row);
+        Reference<RowCursor> tempReference_innerScope3 =
+            new Reference<RowCursor>(innerScope);
+        ResultAssert.InsufficientPermissions(itemType.getType().<LayoutFloat32>TypeAs().DeleteSparse(tempReference_row25,
+            tempReference_innerScope3));
+        innerScope = tempReference_innerScope3.get();
+        row = tempReference_row25.get();
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -892,82 +894,82 @@ public final class TypedSetUnitTests {
             t1.Projects = new ArrayList<UUID>(permutation);
 
             row.InitLayout(HybridRowVersion.V1, this.layout, this.resolver);
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(row);
-            ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempRef_row, t1, TypedSetUnitTests.SerializeTodo));
-            row = tempRef_row.get();
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(row);
+            ResultAssert.IsSuccess(RowWriter.WriteBuffer(tempReference_row, t1, TypedSetUnitTests.SerializeTodo));
+            row = tempReference_row.get();
 
             // Update the existing Set by updating each item with itself.  This ensures that the RowWriter has
             // maintained the unique index correctly.
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("projects", out c);
-            RefObject<RowBuffer> tempRef_row2 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row2 =
+                new Reference<RowBuffer>(row);
             RowCursor root;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            RowCursor.Create(tempRef_row2, out root);
-            row = tempRef_row2.get();
-            RefObject<RowBuffer> tempRef_row3 =
-                new RefObject<RowBuffer>(row);
+            RowCursor.Create(tempReference_row2, out root);
+            row = tempReference_row2.get();
+            Reference<RowBuffer> tempReference_row3 =
+                new Reference<RowBuffer>(row);
             RowCursor projScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out projScope).Find(tempRef_row3, c.Path);
-            row = tempRef_row3.get();
-            RefObject<RowBuffer> tempRef_row4 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out projScope).Find(tempReference_row3, c.Path);
+            row = tempReference_row3.get();
+            Reference<RowBuffer> tempReference_row4 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row4, ref projScope, out projScope));
-            row = tempRef_row4.get();
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row4, ref projScope, out projScope));
+            row = tempReference_row4.get();
             for (UUID item : t1.Projects) {
-                RefObject<RowBuffer> tempRef_row5 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row5 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row5, Utf8String.Empty);
-                row = tempRef_row5.get();
-                RefObject<RowBuffer> tempRef_row6 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row5, Utf8String.Empty);
+                row = tempReference_row5.get();
+                Reference<RowBuffer> tempReference_row6 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row6,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row6,
                     ref tempCursor, item));
-                row = tempRef_row6.get();
-                RefObject<RowBuffer> tempRef_row7 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row6.get();
+                Reference<RowBuffer> tempReference_row7 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row7, ref projScope,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row7, ref projScope,
                     ref tempCursor));
-                row = tempRef_row7.get();
+                row = tempReference_row7.get();
             }
 
-            RefObject<RowBuffer> tempRef_row8 =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowBuffer> tempRef_row9 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row8 =
+                new Reference<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row9 =
+                new Reference<RowBuffer>(row);
             RowCursor _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            Todo t2 = this.ReadTodo(tempRef_row8, RowCursor.Create(tempRef_row9, out _));
-            row = tempRef_row9.get();
-            row = tempRef_row8.get();
+            Todo t2 = this.ReadTodo(tempReference_row8, RowCursor.Create(tempReference_row9, out _));
+            row = tempReference_row9.get();
+            row = tempReference_row8.get();
             assert t1 == t2;
         }
     }
@@ -986,193 +988,193 @@ public final class TypedSetUnitTests {
             Todo t1 = new Todo();
             t1.Projects = new ArrayList<UUID>(permutation);
 
-            RefObject<RowBuffer> tempRef_row =
-                new RefObject<RowBuffer>(row);
-            RefObject<RowBuffer> tempRef_row2 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row =
+                new Reference<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row2 =
+                new Reference<RowBuffer>(row);
             RowCursor _;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            this.WriteTodo(tempRef_row, RowCursor.Create(tempRef_row2, out _), t1);
-            row = tempRef_row2.get();
-            row = tempRef_row.get();
+            this.WriteTodo(tempReference_row, RowCursor.Create(tempReference_row2, out _), t1);
+            row = tempReference_row2.get();
+            row = tempReference_row.get();
 
             // Attempt to find each item in turn and then delete it.
-            RefObject<RowBuffer> tempRef_row3 =
-                new RefObject<RowBuffer>(row);
-            RowCursor root = RowCursor.Create(tempRef_row3);
-            row = tempRef_row3.get();
+            Reference<RowBuffer> tempReference_row3 =
+                new Reference<RowBuffer>(row);
+            RowCursor root = RowCursor.Create(tempReference_row3);
+            row = tempReference_row3.get();
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert this.layout.TryFind("projects", out c);
-            RefObject<RowBuffer> tempRef_row4 =
-                new RefObject<RowBuffer>(row);
+            Reference<RowBuffer> tempReference_row4 =
+                new Reference<RowBuffer>(row);
             RowCursor setScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            root.Clone(out setScope).Find(tempRef_row4, c.Path);
-            row = tempRef_row4.get();
-            RefObject<RowBuffer> tempRef_row5 =
-                new RefObject<RowBuffer>(row);
+            root.Clone(out setScope).Find(tempReference_row4, c.Path);
+            row = tempReference_row4.get();
+            Reference<RowBuffer> tempReference_row5 =
+                new Reference<RowBuffer>(row);
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
-            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempRef_row5, ref setScope, out setScope));
-            row = tempRef_row5.get();
+            ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().ReadScope(tempReference_row5, ref setScope, out setScope));
+            row = tempReference_row5.get();
             for (UUID elm : t1.Projects) {
                 // Verify it is already there.
-                RefObject<RowBuffer> tempRef_row6 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row6 =
+                    new Reference<RowBuffer>(row);
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row6, Utf8String.Empty);
-                row = tempRef_row6.get();
-                RefObject<RowBuffer> tempRef_row7 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row6, Utf8String.Empty);
+                row = tempReference_row6.get();
+                Reference<RowBuffer> tempReference_row7 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row7,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row7,
                     ref tempCursor, elm));
-                row = tempRef_row7.get();
-                RefObject<RowBuffer> tempRef_row8 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row7.get();
+                Reference<RowBuffer> tempReference_row8 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: C# to Java Converter could not resolve the named parameters in the
                 // following line:
                 //ORIGINAL LINE: ResultAssert.IsSuccess(c.TypeAs<LayoutUniqueScope>().Find(ref row, ref setScope, ref
                 // tempCursor, value: out RowCursor _));
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempRef_row8, ref setScope, ref tempCursor,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().Find(tempReference_row8, ref setScope, ref tempCursor,
                     value:
                 out RowCursor _))
-                row = tempRef_row8.get();
+                row = tempReference_row8.get();
 
                 // Insert it again with update.
-                RefObject<RowBuffer> tempRef_row9 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row9 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row9, Utf8String.Empty);
-                row = tempRef_row9.get();
-                RefObject<RowBuffer> tempRef_row10 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row9, Utf8String.Empty);
+                row = tempReference_row9.get();
+                Reference<RowBuffer> tempReference_row10 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row10,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row10,
                     ref tempCursor, elm));
-                row = tempRef_row10.get();
-                RefObject<RowBuffer> tempRef_row11 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row10.get();
+                Reference<RowBuffer> tempReference_row11 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row11, ref setScope,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row11, ref setScope,
                     ref tempCursor, UpdateOptions.Update));
-                row = tempRef_row11.get();
+                row = tempReference_row11.get();
 
                 // Insert it again with upsert.
-                RefObject<RowBuffer> tempRef_row12 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row12 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row12, Utf8String.Empty);
-                row = tempRef_row12.get();
-                RefObject<RowBuffer> tempRef_row13 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row12, Utf8String.Empty);
+                row = tempReference_row12.get();
+                Reference<RowBuffer> tempReference_row13 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row13,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row13,
                     ref tempCursor, elm));
-                row = tempRef_row13.get();
-                RefObject<RowBuffer> tempRef_row14 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row13.get();
+                Reference<RowBuffer> tempReference_row14 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row14, ref setScope,
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row14, ref setScope,
                     ref tempCursor));
-                row = tempRef_row14.get();
+                row = tempReference_row14.get();
 
                 // Insert it again with insert (fail: exists).
-                RefObject<RowBuffer> tempRef_row15 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row15 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row15, Utf8String.Empty);
-                row = tempRef_row15.get();
-                RefObject<RowBuffer> tempRef_row16 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row15, Utf8String.Empty);
+                row = tempReference_row15.get();
+                Reference<RowBuffer> tempReference_row16 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row16,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row16,
                     ref tempCursor, elm));
-                row = tempRef_row16.get();
-                RefObject<RowBuffer> tempRef_row17 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row16.get();
+                Reference<RowBuffer> tempReference_row17 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row17, ref setScope,
+                ResultAssert.Exists(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row17, ref setScope,
                     ref tempCursor, UpdateOptions.Insert));
-                row = tempRef_row17.get();
+                row = tempReference_row17.get();
 
                 // Insert it again with insert at (fail: disallowed).
-                RefObject<RowBuffer> tempRef_row18 =
-                    new RefObject<RowBuffer>(row);
+                Reference<RowBuffer> tempReference_row18 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
-                root.Clone(out tempCursor).Find(tempRef_row18, Utf8String.Empty);
-                row = tempRef_row18.get();
-                RefObject<RowBuffer> tempRef_row19 =
-                    new RefObject<RowBuffer>(row);
+                root.Clone(out tempCursor).Find(tempReference_row18, Utf8String.Empty);
+                row = tempReference_row18.get();
+                Reference<RowBuffer> tempReference_row19 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempRef_row19,
+                ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().WriteSparse(tempReference_row19,
                     ref tempCursor, elm));
-                row = tempRef_row19.get();
-                RefObject<RowBuffer> tempRef_row20 =
-                    new RefObject<RowBuffer>(row);
+                row = tempReference_row19.get();
+                Reference<RowBuffer> tempReference_row20 =
+                    new Reference<RowBuffer>(row);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
-                ResultAssert.TypeConstraint(c.<LayoutUniqueScope>TypeAs().MoveField(tempRef_row20, ref setScope,
+                ResultAssert.TypeConstraint(c.<LayoutUniqueScope>TypeAs().MoveField(tempReference_row20, ref setScope,
                     ref tempCursor, UpdateOptions.InsertAt));
-                row = tempRef_row20.get();
+                row = tempReference_row20.get();
             }
         }
     }
 
-    private static ShoppingItem ReadShoppingItem(RefObject<RowBuffer> row, RefObject<RowCursor> matchScope) {
+    private static ShoppingItem ReadShoppingItem(Reference<RowBuffer> row, Reference<RowCursor> matchScope) {
         Layout matchLayout = matchScope.get().getLayout();
         ShoppingItem m = new ShoppingItem();
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("label", out c);
-        OutObject<String> tempOut_Label = new OutObject<String>();
+        Out<String> tempOut_Label = new Out<String>();
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().ReadVariable(row, matchScope, c, tempOut_Label));
         m.Label = tempOut_Label.get();
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("count", out c);
-        OutObject<Byte> tempOut_Count = new OutObject<Byte>();
+        Out<Byte> tempOut_Count = new Out<Byte>();
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: ResultAssert.IsSuccess(c.TypeAs<LayoutUInt8>().ReadFixed(ref row, ref matchScope, c, out m.Count));
         ResultAssert.IsSuccess(c.<LayoutUInt8>TypeAs().ReadFixed(row, matchScope, c, tempOut_Count));
@@ -1180,30 +1182,30 @@ public final class TypedSetUnitTests {
         return m;
     }
 
-    private Todo ReadTodo(RefObject<RowBuffer> row, RefObject<RowCursor> root) {
+    private Todo ReadTodo(Reference<RowBuffer> row, Reference<RowCursor> root) {
         Todo value = new Todo();
 
         LayoutColumn c;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("attendees", out c);
         RowCursor tagsScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out tagsScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref tagsScope, out tagsScope) == Result.Success) {
             value.Attendees = new ArrayList<String>();
             while (tagsScope.MoveNext(row)) {
                 String item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutUtf8>TypeAs().ReadSparse(row, ref tagsScope,
                     out item));
@@ -1212,25 +1214,25 @@ public final class TypedSetUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("projects", out c);
         RowCursor projScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out projScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref projScope, out projScope) == Result.Success) {
             value.Projects = new ArrayList<UUID>();
             while (projScope.MoveNext(row)) {
                 java.util.UUID item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutGuid>TypeAs().ReadSparse(row, ref projScope,
                     out item));
@@ -1239,25 +1241,25 @@ public final class TypedSetUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("checkboxes", out c);
         RowCursor checkboxScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out checkboxScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref checkboxScope, out checkboxScope) == Result.Success) {
             value.Checkboxes = new ArrayList<Boolean>();
             while (checkboxScope.MoveNext(row)) {
                 boolean item;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.TypeArgs[0].Type.<LayoutBoolean>TypeAs().ReadSparse(row, ref checkboxScope,
                     out item));
@@ -1266,39 +1268,39 @@ public final class TypedSetUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("prices", out c);
         RowCursor pricesScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out pricesScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref pricesScope, out pricesScope) == Result.Success) {
             value.Prices = new ArrayList<ArrayList<Float>>();
             TypeArgument innerType = c.TypeArgs[0];
             LayoutUniqueScope innerLayout = innerType.getType().<LayoutUniqueScope>TypeAs();
             while (pricesScope.MoveNext(row)) {
                 ArrayList<Float> item = new ArrayList<Float>();
-                RefObject<RowCursor> tempRef_pricesScope =
-                    new RefObject<RowCursor>(pricesScope);
+                Reference<RowCursor> tempReference_pricesScope =
+                    new Reference<RowCursor>(pricesScope);
                 RowCursor innerScope;
-                OutObject<RowCursor> tempOut_innerScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_pricesScope, tempOut_innerScope));
+                Out<RowCursor> tempOut_innerScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_pricesScope, tempOut_innerScope));
                 innerScope = tempOut_innerScope.get();
-                pricesScope = tempRef_pricesScope.get();
+                pricesScope = tempReference_pricesScope.get();
                 while (innerScope.MoveNext(row)) {
                     LayoutFloat32 itemLayout = innerType.getTypeArgs().get(0).getType().<LayoutFloat32>TypeAs();
-                    RefObject<RowCursor> tempRef_innerScope =
-                        new RefObject<RowCursor>(innerScope);
+                    Reference<RowCursor> tempReference_innerScope =
+                        new Reference<RowCursor>(innerScope);
                     float innerItem;
-                    OutObject<Float> tempOut_innerItem = new OutObject<Float>();
-                    ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempRef_innerScope, tempOut_innerItem));
+                    Out<Float> tempOut_innerItem = new Out<Float>();
+                    ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempReference_innerScope, tempOut_innerItem));
                     innerItem = tempOut_innerItem.get();
-                    innerScope = tempRef_innerScope.get();
+                    innerScope = tempReference_innerScope.get();
                     item.add(innerItem);
                 }
 
@@ -1307,50 +1309,50 @@ public final class TypedSetUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("nested", out c);
         RowCursor nestedScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out nestedScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref nestedScope, out nestedScope) == Result.Success) {
             value.Nested = new ArrayList<ArrayList<ArrayList<Integer>>>();
             TypeArgument in2Type = c.TypeArgs[0];
             LayoutUniqueScope in2Layout = in2Type.getType().<LayoutUniqueScope>TypeAs();
             while (nestedScope.MoveNext(row)) {
                 ArrayList<ArrayList<Integer>> item = new ArrayList<ArrayList<Integer>>();
-                RefObject<RowCursor> tempRef_nestedScope =
-                    new RefObject<RowCursor>(nestedScope);
+                Reference<RowCursor> tempReference_nestedScope =
+                    new Reference<RowCursor>(nestedScope);
                 RowCursor in2Scope;
-                OutObject<RowCursor> tempOut_in2Scope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(in2Layout.ReadScope(row, tempRef_nestedScope, tempOut_in2Scope));
+                Out<RowCursor> tempOut_in2Scope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(in2Layout.ReadScope(row, tempReference_nestedScope, tempOut_in2Scope));
                 in2Scope = tempOut_in2Scope.get();
-                nestedScope = tempRef_nestedScope.get();
+                nestedScope = tempReference_nestedScope.get();
                 while (in2Scope.MoveNext(row)) {
                     TypeArgument in3Type = in2Type.getTypeArgs().get(0).clone();
                     LayoutUniqueScope in3Layout = in3Type.getType().<LayoutUniqueScope>TypeAs();
                     ArrayList<Integer> item2 = new ArrayList<Integer>();
-                    RefObject<RowCursor> tempRef_in2Scope =
-                        new RefObject<RowCursor>(in2Scope);
+                    Reference<RowCursor> tempReference_in2Scope =
+                        new Reference<RowCursor>(in2Scope);
                     RowCursor in3Scope;
-                    OutObject<RowCursor> tempOut_in3Scope =
-                        new OutObject<RowCursor>();
-                    ResultAssert.IsSuccess(in3Layout.ReadScope(row, tempRef_in2Scope, tempOut_in3Scope));
+                    Out<RowCursor> tempOut_in3Scope =
+                        new Out<RowCursor>();
+                    ResultAssert.IsSuccess(in3Layout.ReadScope(row, tempReference_in2Scope, tempOut_in3Scope));
                     in3Scope = tempOut_in3Scope.get();
-                    in2Scope = tempRef_in2Scope.get();
+                    in2Scope = tempReference_in2Scope.get();
                     while (in3Scope.MoveNext(row)) {
                         LayoutInt32 itemLayout = in3Type.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs();
-                        RefObject<RowCursor> tempRef_in3Scope = new RefObject<RowCursor>(in3Scope);
+                        Reference<RowCursor> tempReference_in3Scope = new Reference<RowCursor>(in3Scope);
                         int innerItem;
-                        OutObject<Integer> tempOut_innerItem2 = new OutObject<Integer>();
-                        ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempRef_in3Scope, tempOut_innerItem2));
+                        Out<Integer> tempOut_innerItem2 = new Out<Integer>();
+                        ResultAssert.IsSuccess(itemLayout.ReadSparse(row, tempReference_in3Scope, tempOut_innerItem2));
                         innerItem = tempOut_innerItem2.get();
-                        in3Scope = tempRef_in3Scope.get();
+                        in3Scope = tempReference_in3Scope.get();
                         item2.add(innerItem);
                     }
 
@@ -1362,47 +1364,47 @@ public final class TypedSetUnitTests {
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("shopping", out c);
         RowCursor shoppingScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out shoppingScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-        // cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref shoppingScope, out shoppingScope) == Result.Success) {
             value.Shopping = new ArrayList<ShoppingItem>();
             while (shoppingScope.MoveNext(row)) {
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutUDT innerLayout = innerType.getType().<LayoutUDT>TypeAs();
-                RefObject<RowCursor> tempRef_shoppingScope =
-                    new RefObject<RowCursor>(shoppingScope);
+                Reference<RowCursor> tempReference_shoppingScope =
+                    new Reference<RowCursor>(shoppingScope);
                 RowCursor matchScope;
-                OutObject<RowCursor> tempOut_matchScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_shoppingScope, tempOut_matchScope));
+                Out<RowCursor> tempOut_matchScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_shoppingScope, tempOut_matchScope));
                 matchScope = tempOut_matchScope.get();
-                shoppingScope = tempRef_shoppingScope.get();
-                RefObject<RowCursor> tempRef_matchScope =
-                    new RefObject<RowCursor>(matchScope);
-                ShoppingItem item = TypedSetUnitTests.ReadShoppingItem(row, tempRef_matchScope);
-                matchScope = tempRef_matchScope.get();
+                shoppingScope = tempReference_shoppingScope.get();
+                Reference<RowCursor> tempReference_matchScope =
+                    new Reference<RowCursor>(matchScope);
+                ShoppingItem item = TypedSetUnitTests.ReadShoppingItem(row, tempReference_matchScope);
+                matchScope = tempReference_matchScope.get();
                 value.Shopping.add(item);
             }
         }
 
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert this.layout.TryFind("work", out c);
         RowCursor workScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         root.get().Clone(out workScope).Find(row, c.Path);
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'RefObject' helper class unless the method is within the code being modified:
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these cannot be converted using the 'Ref' helper class unless the method is within the code being modified:
         if (c.<LayoutUniqueScope>TypeAs().ReadScope(row, ref workScope, out workScope) == Result.Success) {
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: value.Work = new List<Tuple<bool, ulong>>();
@@ -1411,28 +1413,28 @@ public final class TypedSetUnitTests {
                 TypeArgument innerType = c.TypeArgs[0];
                 LayoutIndexedScope innerLayout = innerType.getType().<LayoutIndexedScope>TypeAs();
 
-                RefObject<RowCursor> tempRef_workScope = new RefObject<RowCursor>(workScope);
+                Reference<RowCursor> tempReference_workScope = new Reference<RowCursor>(workScope);
                 RowCursor tupleScope;
-                OutObject<RowCursor> tempOut_tupleScope = new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempRef_workScope, tempOut_tupleScope));
+                Out<RowCursor> tempOut_tupleScope = new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.ReadScope(row, tempReference_workScope, tempOut_tupleScope));
                 tupleScope = tempOut_tupleScope.get();
-                workScope = tempRef_workScope.get();
+                workScope = tempReference_workScope.get();
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope = new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope = new Reference<RowCursor>(tupleScope);
                 boolean item1;
-                OutObject<Boolean> tempOut_item1 = new OutObject<Boolean>();
-                ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().ReadSparse(row, tempRef_tupleScope, tempOut_item1));
+                Out<Boolean> tempOut_item1 = new Out<Boolean>();
+                ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().ReadSparse(row, tempReference_tupleScope, tempOut_item1));
                 item1 = tempOut_item1.get();
-                tupleScope = tempRef_tupleScope.get();
+                tupleScope = tempReference_tupleScope.get();
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope2 = new RefObject<RowCursor>(tupleScope);
+                Reference<RowCursor> tempReference_tupleScope2 = new Reference<RowCursor>(tupleScope);
                 long item2;
-                OutObject<Long> tempOut_item2 = new OutObject<Long>();
+                Out<Long> tempOut_item2 = new Out<Long>();
                 //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
                 //ORIGINAL LINE: ResultAssert.IsSuccess(innerType.TypeArgs[1].Type.TypeAs<LayoutVarUInt>().ReadSparse(ref row, ref tupleScope, out ulong item2));
-                ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().ReadSparse(row, tempRef_tupleScope2, tempOut_item2));
+                ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().ReadSparse(row, tempReference_tupleScope2, tempOut_item2));
                 item2 = tempOut_item2.get();
-                tupleScope = tempRef_tupleScope2.get();
+                tupleScope = tempReference_tupleScope2.get();
                 value.Work.add(Tuple.Create(item1, item2));
             }
         }
@@ -1440,11 +1442,11 @@ public final class TypedSetUnitTests {
         return value;
     }
 
-    private static Result SerializeTodo(RefObject<RowWriter> writer, TypeArgument typeArg, Todo value) {
+    private static Result SerializeTodo(Reference<RowWriter> writer, TypeArgument typeArg, Todo value) {
         if (value.Projects != null) {
             LayoutColumn c;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             assert writer.get().getLayout().TryFind("projects", out c);
             // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are
@@ -1464,155 +1466,155 @@ public final class TypedSetUnitTests {
         return Result.Success;
     }
 
-    private static void WriteShoppingItem(RefObject<RowBuffer> row, RefObject<RowCursor> matchScope, TypeArgumentList typeArgs, ShoppingItem m) {
+    private static void WriteShoppingItem(Reference<RowBuffer> row, Reference<RowCursor> matchScope, TypeArgumentList typeArgs, ShoppingItem m) {
         Layout matchLayout = row.get().getResolver().Resolve(typeArgs.getSchemaId().clone());
         LayoutColumn c;
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("label", out c);
         ResultAssert.IsSuccess(c.<LayoutUtf8>TypeAs().WriteVariable(row, matchScope, c, m.Label));
-        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
+        // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these cannot be converted using the 'Out' helper class unless the method is within the code being modified:
         assert matchLayout.TryFind("count", out c);
         ResultAssert.IsSuccess(c.<LayoutUInt8>TypeAs().WriteFixed(row, matchScope, c, m.Count));
     }
 
-    private void WriteTodo(RefObject<RowBuffer> row, RefObject<RowCursor> root, Todo value) {
+    private void WriteTodo(Reference<RowBuffer> row, Reference<RowCursor> root, Todo value) {
         LayoutColumn c;
 
         if (value.Attendees != null) {
-            OutObject<LayoutColumn> tempOut_c =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("attendees", tempOut_c);
             c = tempOut_c.get();
             RowCursor attendScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out attendScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref attendScope,
                 c.getTypeArgs().clone(), out attendScope));
             for (String item : value.Attendees) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(c.getTypeArgs().get(0).getType().<LayoutUtf8>TypeAs().WriteSparse(row,
                     ref tempCursor, item));
-                RefObject<RowCursor> tempRef_attendScope =
-                    new RefObject<RowCursor>(attendScope);
-                RefObject<RowCursor> tempRef_tempCursor =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_attendScope,
-                    tempRef_tempCursor));
-                tempCursor = tempRef_tempCursor.get();
-                attendScope = tempRef_attendScope.get();
+                Reference<RowCursor> tempReference_attendScope =
+                    new Reference<RowCursor>(attendScope);
+                Reference<RowCursor> tempReference_tempCursor =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_attendScope,
+                    tempReference_tempCursor));
+                tempCursor = tempReference_tempCursor.get();
+                attendScope = tempReference_attendScope.get();
             }
         }
 
         if (value.Projects != null) {
-            OutObject<LayoutColumn> tempOut_c2 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c2 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("projects", tempOut_c2);
             c = tempOut_c2.get();
             RowCursor projScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out projScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref projScope,
                 c.getTypeArgs().clone(), out projScope));
             for (UUID item : value.Projects) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
-                RefObject<RowCursor> tempRef_tempCursor2 =
-                    new RefObject<RowCursor>(tempCursor);
+                Reference<RowCursor> tempReference_tempCursor2 =
+                    new Reference<RowCursor>(tempCursor);
                 ResultAssert.IsSuccess(c.getTypeArgs().get(0).getType().<LayoutGuid>TypeAs().WriteSparse(row,
-                    tempRef_tempCursor2, item));
-                tempCursor = tempRef_tempCursor2.get();
-                RefObject<RowCursor> tempRef_projScope =
-                    new RefObject<RowCursor>(projScope);
-                RefObject<RowCursor> tempRef_tempCursor3 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_projScope,
-                    tempRef_tempCursor3));
-                tempCursor = tempRef_tempCursor3.get();
-                projScope = tempRef_projScope.get();
+                    tempReference_tempCursor2, item));
+                tempCursor = tempReference_tempCursor2.get();
+                Reference<RowCursor> tempReference_projScope =
+                    new Reference<RowCursor>(projScope);
+                Reference<RowCursor> tempReference_tempCursor3 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_projScope,
+                    tempReference_tempCursor3));
+                tempCursor = tempReference_tempCursor3.get();
+                projScope = tempReference_projScope.get();
             }
         }
 
         if (value.Checkboxes != null) {
-            OutObject<LayoutColumn> tempOut_c3 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c3 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("checkboxes", tempOut_c3);
             c = tempOut_c3.get();
             RowCursor checkboxScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out checkboxScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref checkboxScope,
                 c.getTypeArgs().clone(), out checkboxScope));
             for (boolean item : value.Checkboxes) {
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
-                RefObject<RowCursor> tempRef_tempCursor4 =
-                    new RefObject<RowCursor>(tempCursor);
+                Reference<RowCursor> tempReference_tempCursor4 =
+                    new Reference<RowCursor>(tempCursor);
                 ResultAssert.IsSuccess(c.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().WriteSparse(row,
-                    tempRef_tempCursor4, item));
-                tempCursor = tempRef_tempCursor4.get();
-                RefObject<RowCursor> tempRef_checkboxScope =
-                    new RefObject<RowCursor>(checkboxScope);
-                RefObject<RowCursor> tempRef_tempCursor5 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_checkboxScope,
-                    tempRef_tempCursor5));
-                tempCursor = tempRef_tempCursor5.get();
-                checkboxScope = tempRef_checkboxScope.get();
+                    tempReference_tempCursor4, item));
+                tempCursor = tempReference_tempCursor4.get();
+                Reference<RowCursor> tempReference_checkboxScope =
+                    new Reference<RowCursor>(checkboxScope);
+                Reference<RowCursor> tempReference_tempCursor5 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_checkboxScope,
+                    tempReference_tempCursor5));
+                tempCursor = tempReference_tempCursor5.get();
+                checkboxScope = tempReference_checkboxScope.get();
             }
         }
 
         if (value.Prices != null) {
-            OutObject<LayoutColumn> tempOut_c4 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c4 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("prices", tempOut_c4);
             c = tempOut_c4.get();
             RowCursor pricesScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out pricesScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref pricesScope,
                 c.getTypeArgs().clone(), out pricesScope));
@@ -1622,15 +1624,15 @@ public final class TypedSetUnitTests {
                 LayoutUniqueScope innerLayout = innerType.getType().<LayoutUniqueScope>TypeAs();
                 RowCursor tempCursor1;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor1).Find(row, "prices.0");
                 RowCursor innerScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(innerLayout.WriteScope(row, ref tempCursor1, innerType.getTypeArgs().clone(),
                     out innerScope));
@@ -1638,47 +1640,47 @@ public final class TypedSetUnitTests {
                     LayoutFloat32 itemLayout = innerType.getTypeArgs().get(0).getType().<LayoutFloat32>TypeAs();
                     RowCursor tempCursor2;
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword
-                    // - these cannot be converted using the 'OutObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Out' helper class unless the method is within the
                     // code being modified:
                     root.get().Clone(out tempCursor2).Find(row, "prices.0.0");
-                    RefObject<RowCursor> tempRef_tempCursor2
-                        = new RefObject<RowCursor>(tempCursor2);
-                    ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempRef_tempCursor2, innerItem));
-                    tempCursor2 = tempRef_tempCursor2.get();
-                    RefObject<RowCursor> tempRef_innerScope =
-                        new RefObject<RowCursor>(innerScope);
-                    RefObject<RowCursor> tempRef_tempCursor22 = new RefObject<RowCursor>(tempCursor2);
-                    ResultAssert.IsSuccess(innerLayout.MoveField(row, tempRef_innerScope, tempRef_tempCursor22));
-                    tempCursor2 = tempRef_tempCursor22.get();
-                    innerScope = tempRef_innerScope.get();
+                    Reference<RowCursor> tempReference_tempCursor2
+                        = new Reference<RowCursor>(tempCursor2);
+                    ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempReference_tempCursor2, innerItem));
+                    tempCursor2 = tempReference_tempCursor2.get();
+                    Reference<RowCursor> tempReference_innerScope =
+                        new Reference<RowCursor>(innerScope);
+                    Reference<RowCursor> tempReference_tempCursor22 = new Reference<RowCursor>(tempCursor2);
+                    ResultAssert.IsSuccess(innerLayout.MoveField(row, tempReference_innerScope, tempReference_tempCursor22));
+                    tempCursor2 = tempReference_tempCursor22.get();
+                    innerScope = tempReference_innerScope.get();
                 }
 
-                RefObject<RowCursor> tempRef_pricesScope =
-                    new RefObject<RowCursor>(pricesScope);
-                RefObject<RowCursor> tempRef_tempCursor1 =
-                    new RefObject<RowCursor>(tempCursor1);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_pricesScope,
-                    tempRef_tempCursor1));
-                tempCursor1 = tempRef_tempCursor1.get();
-                pricesScope = tempRef_pricesScope.get();
+                Reference<RowCursor> tempReference_pricesScope =
+                    new Reference<RowCursor>(pricesScope);
+                Reference<RowCursor> tempReference_tempCursor1 =
+                    new Reference<RowCursor>(tempCursor1);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_pricesScope,
+                    tempReference_tempCursor1));
+                tempCursor1 = tempReference_tempCursor1.get();
+                pricesScope = tempReference_pricesScope.get();
             }
         }
 
         if (value.Nested != null) {
-            OutObject<LayoutColumn> tempOut_c5 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c5 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("nested", tempOut_c5);
             c = tempOut_c5.get();
             RowCursor nestedScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out nestedScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref nestedScope,
                 c.getTypeArgs().clone(), out nestedScope));
@@ -1688,15 +1690,15 @@ public final class TypedSetUnitTests {
                 LayoutUniqueScope in2Layout = in2Type.getType().<LayoutUniqueScope>TypeAs();
                 RowCursor tempCursor1;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor1).Find(row, "prices.0");
                 RowCursor in2Scope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(in2Layout.WriteScope(row, ref tempCursor1, in2Type.getTypeArgs().clone(),
                     out in2Scope));
@@ -1706,15 +1708,15 @@ public final class TypedSetUnitTests {
                     LayoutUniqueScope in3Layout = in3Type.getType().<LayoutUniqueScope>TypeAs();
                     RowCursor tempCursor2;
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword
-                    // - these cannot be converted using the 'OutObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Out' helper class unless the method is within the
                     // code being modified:
                     root.get().Clone(out tempCursor2).Find(row, "prices.0.0");
                     RowCursor in3Scope;
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword
-                    // - these cannot be converted using the 'OutObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Out' helper class unless the method is within the
                     // code being modified:
                     // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword
-                    // - these cannot be converted using the 'RefObject' helper class unless the method is within the
+                    // - these cannot be converted using the 'Ref' helper class unless the method is within the
                     // code being modified:
                     ResultAssert.IsSuccess(in3Layout.WriteScope(row, ref tempCursor2, in3Type.getTypeArgs().clone(),
                         out in3Scope));
@@ -1722,53 +1724,53 @@ public final class TypedSetUnitTests {
                         LayoutInt32 itemLayout = in3Type.getTypeArgs().get(0).getType().<LayoutInt32>TypeAs();
                         RowCursor tempCursor3;
                         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out'
-                        // keyword - these cannot be converted using the 'OutObject' helper class unless the method
+                        // keyword - these cannot be converted using the 'Out' helper class unless the method
                         // is within the code being modified:
                         root.get().Clone(out tempCursor3).Find(row, "prices.0.0.0");
-                        RefObject<RowCursor> tempRef_tempCursor3 = new RefObject<RowCursor>(tempCursor3);
-                        ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempRef_tempCursor3, innerItem));
-                        tempCursor3 = tempRef_tempCursor3.get();
-                        RefObject<RowCursor> tempRef_in3Scope = new RefObject<RowCursor>(in3Scope);
-                        RefObject<RowCursor> tempRef_tempCursor32 = new RefObject<RowCursor>(tempCursor3);
-                        ResultAssert.IsSuccess(in3Layout.MoveField(row, tempRef_in3Scope, tempRef_tempCursor32));
-                        tempCursor3 = tempRef_tempCursor32.get();
-                        in3Scope = tempRef_in3Scope.get();
+                        Reference<RowCursor> tempReference_tempCursor3 = new Reference<RowCursor>(tempCursor3);
+                        ResultAssert.IsSuccess(itemLayout.WriteSparse(row, tempReference_tempCursor3, innerItem));
+                        tempCursor3 = tempReference_tempCursor3.get();
+                        Reference<RowCursor> tempReference_in3Scope = new Reference<RowCursor>(in3Scope);
+                        Reference<RowCursor> tempReference_tempCursor32 = new Reference<RowCursor>(tempCursor3);
+                        ResultAssert.IsSuccess(in3Layout.MoveField(row, tempReference_in3Scope, tempReference_tempCursor32));
+                        tempCursor3 = tempReference_tempCursor32.get();
+                        in3Scope = tempReference_in3Scope.get();
                     }
 
-                    RefObject<RowCursor> tempRef_in2Scope =
-                        new RefObject<RowCursor>(in2Scope);
-                    RefObject<RowCursor> tempRef_tempCursor23 = new RefObject<RowCursor>(tempCursor2);
-                    ResultAssert.IsSuccess(in2Layout.MoveField(row, tempRef_in2Scope, tempRef_tempCursor23));
-                    tempCursor2 = tempRef_tempCursor23.get();
-                    in2Scope = tempRef_in2Scope.get();
+                    Reference<RowCursor> tempReference_in2Scope =
+                        new Reference<RowCursor>(in2Scope);
+                    Reference<RowCursor> tempReference_tempCursor23 = new Reference<RowCursor>(tempCursor2);
+                    ResultAssert.IsSuccess(in2Layout.MoveField(row, tempReference_in2Scope, tempReference_tempCursor23));
+                    tempCursor2 = tempReference_tempCursor23.get();
+                    in2Scope = tempReference_in2Scope.get();
                 }
 
-                RefObject<RowCursor> tempRef_nestedScope =
-                    new RefObject<RowCursor>(nestedScope);
-                RefObject<RowCursor> tempRef_tempCursor12 =
-                    new RefObject<RowCursor>(tempCursor1);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_nestedScope,
-                    tempRef_tempCursor12));
-                tempCursor1 = tempRef_tempCursor12.get();
-                nestedScope = tempRef_nestedScope.get();
+                Reference<RowCursor> tempReference_nestedScope =
+                    new Reference<RowCursor>(nestedScope);
+                Reference<RowCursor> tempReference_tempCursor12 =
+                    new Reference<RowCursor>(tempCursor1);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_nestedScope,
+                    tempReference_tempCursor12));
+                tempCursor1 = tempReference_tempCursor12.get();
+                nestedScope = tempReference_nestedScope.get();
             }
         }
 
         if (value.Shopping != null) {
-            OutObject<LayoutColumn> tempOut_c6 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c6 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("shopping", tempOut_c6);
             c = tempOut_c6.get();
             RowCursor shoppingScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out shoppingScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref shoppingScope,
                 c.getTypeArgs().clone(), out shoppingScope));
@@ -1777,48 +1779,48 @@ public final class TypedSetUnitTests {
                 LayoutUDT innerLayout = innerType.getType().<LayoutUDT>TypeAs();
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
-                RefObject<RowCursor> tempRef_tempCursor6 =
-                    new RefObject<RowCursor>(tempCursor);
+                Reference<RowCursor> tempReference_tempCursor6 =
+                    new Reference<RowCursor>(tempCursor);
                 RowCursor itemScope;
-                OutObject<RowCursor> tempOut_itemScope =
-                    new OutObject<RowCursor>();
-                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempRef_tempCursor6,
+                Out<RowCursor> tempOut_itemScope =
+                    new Out<RowCursor>();
+                ResultAssert.IsSuccess(innerLayout.WriteScope(row, tempReference_tempCursor6,
                     innerType.getTypeArgs().clone(), tempOut_itemScope));
                 itemScope = tempOut_itemScope.get();
-                tempCursor = tempRef_tempCursor6.get();
-                RefObject<RowCursor> tempRef_itemScope =
-                    new RefObject<RowCursor>(itemScope);
-                TypedSetUnitTests.WriteShoppingItem(row, tempRef_itemScope, innerType.getTypeArgs().clone(), item);
-                itemScope = tempRef_itemScope.get();
-                RefObject<RowCursor> tempRef_shoppingScope =
-                    new RefObject<RowCursor>(shoppingScope);
-                RefObject<RowCursor> tempRef_tempCursor7 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_shoppingScope,
-                    tempRef_tempCursor7));
-                tempCursor = tempRef_tempCursor7.get();
-                shoppingScope = tempRef_shoppingScope.get();
+                tempCursor = tempReference_tempCursor6.get();
+                Reference<RowCursor> tempReference_itemScope =
+                    new Reference<RowCursor>(itemScope);
+                TypedSetUnitTests.WriteShoppingItem(row, tempReference_itemScope, innerType.getTypeArgs().clone(), item);
+                itemScope = tempReference_itemScope.get();
+                Reference<RowCursor> tempReference_shoppingScope =
+                    new Reference<RowCursor>(shoppingScope);
+                Reference<RowCursor> tempReference_tempCursor7 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_shoppingScope,
+                    tempReference_tempCursor7));
+                tempCursor = tempReference_tempCursor7.get();
+                shoppingScope = tempReference_shoppingScope.get();
             }
         }
 
         if (value.Work != null) {
-            OutObject<LayoutColumn> tempOut_c7 =
-                new OutObject<LayoutColumn>();
+            Out<LayoutColumn> tempOut_c7 =
+                new Out<LayoutColumn>();
             assert this.layout.TryFind("work", tempOut_c7);
             c = tempOut_c7.get();
             RowCursor workScope;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             root.get().Clone(out workScope).Find(row, c.getPath());
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().WriteScope(row, ref workScope,
                 c.getTypeArgs().clone(), out workScope));
@@ -1829,35 +1831,35 @@ public final class TypedSetUnitTests {
                 LayoutIndexedScope innerLayout = innerType.getType().<LayoutIndexedScope>TypeAs();
                 RowCursor tempCursor;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 root.get().Clone(out tempCursor).Find(row, Utf8String.Empty);
                 RowCursor tupleScope;
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword -
-                // these cannot be converted using the 'OutObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Out' helper class unless the method is within the code
                 // being modified:
                 // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword -
-                // these cannot be converted using the 'RefObject' helper class unless the method is within the code
+                // these cannot be converted using the 'Ref' helper class unless the method is within the code
                 // being modified:
                 ResultAssert.IsSuccess(innerLayout.WriteScope(row, ref tempCursor, innerType.getTypeArgs().clone(),
                     out tupleScope));
-                RefObject<RowCursor> tempRef_tupleScope =
-                    new RefObject<RowCursor>(tupleScope);
-                ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().WriteSparse(row, tempRef_tupleScope, item.Item1));
-                tupleScope = tempRef_tupleScope.get();
+                Reference<RowCursor> tempReference_tupleScope =
+                    new Reference<RowCursor>(tupleScope);
+                ResultAssert.IsSuccess(innerType.getTypeArgs().get(0).getType().<LayoutBoolean>TypeAs().WriteSparse(row, tempReference_tupleScope, item.Item1));
+                tupleScope = tempReference_tupleScope.get();
                 assert tupleScope.MoveNext(row);
-                RefObject<RowCursor> tempRef_tupleScope2 =
-                    new RefObject<RowCursor>(tupleScope);
-                ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().WriteSparse(row, tempRef_tupleScope2, item.Item2));
-                tupleScope = tempRef_tupleScope2.get();
-                RefObject<RowCursor> tempRef_workScope =
-                    new RefObject<RowCursor>(workScope);
-                RefObject<RowCursor> tempRef_tempCursor8 =
-                    new RefObject<RowCursor>(tempCursor);
-                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempRef_workScope,
-                    tempRef_tempCursor8));
-                tempCursor = tempRef_tempCursor8.get();
-                workScope = tempRef_workScope.get();
+                Reference<RowCursor> tempReference_tupleScope2 =
+                    new Reference<RowCursor>(tupleScope);
+                ResultAssert.IsSuccess(innerType.getTypeArgs().get(1).getType().<LayoutVarUInt>TypeAs().WriteSparse(row, tempReference_tupleScope2, item.Item2));
+                tupleScope = tempReference_tupleScope2.get();
+                Reference<RowCursor> tempReference_workScope =
+                    new Reference<RowCursor>(workScope);
+                Reference<RowCursor> tempReference_tempCursor8 =
+                    new Reference<RowCursor>(tempCursor);
+                ResultAssert.IsSuccess(c.<LayoutUniqueScope>TypeAs().MoveField(row, tempReference_workScope,
+                    tempReference_tempCursor8));
+                tempCursor = tempReference_tempCursor8.get();
+                workScope = tempReference_workScope.get();
             }
         }
     }
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/WriteRowDispatcher.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/WriteRowDispatcher.java
index 757f378..ed3cc6a 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/WriteRowDispatcher.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/WriteRowDispatcher.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.RowBuffer;
 import com.azure.data.cosmos.serialization.hybridrow.RowCursor;
 import com.azure.data.cosmos.serialization.hybridrow.layouts.LayoutType;
@@ -20,229 +21,229 @@ import java.util.UUID;
 //ORIGINAL LINE: internal struct WriteRowDispatcher : IDispatcher
 public final class WriteRowDispatcher implements IDispatcher {
 
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> field, LayoutColumn col, LayoutType t) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> field, LayoutColumn col, LayoutType t) {
         Dispatch(dispatcher, field, col, t, null);
     }
 
     //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
     //ORIGINAL LINE: public void Dispatch<TLayout, TValue>(ref RowOperationDispatcher dispatcher, ref RowCursor
     // field, LayoutColumn col, LayoutType t, TValue value = default) where TLayout : LayoutType<TValue>
-    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(RefObject<RowOperationDispatcher> dispatcher, RefObject<RowCursor> field, LayoutColumn col, LayoutType t, TValue value) {
+    public <TLayout extends LayoutType<TValue>, TValue> void Dispatch(Reference<RowOperationDispatcher> dispatcher, Reference<RowCursor> field, LayoutColumn col, LayoutType t, TValue value) {
         switch (col == null ? null : col.getStorage()) {
             case Fixed:
-                RefObject<RowBuffer> tempRef_Row =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteFixed(tempRef_Row, field, col, value));
-                dispatcher.get().argValue.Row = tempRef_Row.get();
+                Reference<RowBuffer> tempReference_Row =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteFixed(tempReference_Row, field, col, value));
+                dispatcher.get().argValue.Row = tempReference_Row.get();
                 break;
             case Variable:
-                RefObject<RowBuffer> tempRef_Row2 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteVariable(tempRef_Row2, field, col, value));
-                dispatcher.get().argValue.Row = tempRef_Row2.get();
+                Reference<RowBuffer> tempReference_Row2 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteVariable(tempReference_Row2, field, col, value));
+                dispatcher.get().argValue.Row = tempReference_Row2.get();
                 break;
             default:
-                RefObject<RowBuffer> tempRef_Row3 =
-                    new RefObject<RowBuffer>(dispatcher.get().Row);
-                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteSparse(tempRef_Row3, field, value));
-                dispatcher.get().argValue.Row = tempRef_Row3.get();
+                Reference<RowBuffer> tempReference_Row3 =
+                    new Reference<RowBuffer>(dispatcher.get().Row);
+                ResultAssert.IsSuccess(t.<TLayout>TypeAs().WriteSparse(tempReference_Row3, field, value));
+                dispatcher.get().argValue.Row = tempReference_Row3.get();
                 break;
         }
     }
 
-    public void DispatchArray(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchArray(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor arrayScope;
-        OutObject<RowCursor> tempOut_arrayScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(),
+        Out<RowCursor> tempOut_arrayScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedArray>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(),
             tempOut_arrayScope));
         arrayScope = tempOut_arrayScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         List items = (List)value;
         for (Object item : items) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref arrayScope, null, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), item);
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            arrayScope.MoveNext(tempRef_Row2);
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            arrayScope.MoveNext(tempReference_Row2);
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
         }
     }
 
-    public void DispatchMap(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchMap(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 2);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor mapScope;
-        OutObject<RowCursor> tempOut_mapScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(),
+        Out<RowCursor> tempOut_mapScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(),
             tempOut_mapScope));
         mapScope = tempOut_mapScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
-        RefObject<RowCursor> tempRef_mapScope =
-            new RefObject<RowCursor>(mapScope);
-        TypeArgument fieldType = t.<LayoutUniqueScope>TypeAs().FieldType(tempRef_mapScope).clone();
-        mapScope = tempRef_mapScope.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
+        Reference<RowCursor> tempReference_mapScope =
+            new Reference<RowCursor>(mapScope);
+        TypeArgument fieldType = t.<LayoutUniqueScope>TypeAs().FieldType(tempReference_mapScope).clone();
+        mapScope = tempReference_mapScope.get();
         List pairs = (List)value;
         for (Object pair : pairs) {
             String elmPath = UUID.NewGuid().toString();
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            RowCursor.CreateForAppend(tempRef_Row2, out tempCursor);
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+            RowCursor.CreateForAppend(tempReference_Row2, out tempCursor);
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref tempCursor, elmPath, fieldType.getType(),
                 fieldType.getTypeArgs().clone(), pair);
 
             // Move item into the map.
-            RefObject<RowBuffer> tempRef_Row3 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            RefObject<RowCursor> tempRef_mapScope2 =
-                new RefObject<RowCursor>(mapScope);
-            RefObject<RowCursor> tempRef_tempCursor =
-                new RefObject<RowCursor>(tempCursor);
-            ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().MoveField(tempRef_Row3, tempRef_mapScope2,
-                tempRef_tempCursor));
-            tempCursor = tempRef_tempCursor.get();
-            mapScope = tempRef_mapScope2.get();
-            dispatcher.get().argValue.Row = tempRef_Row3.get();
+            Reference<RowBuffer> tempReference_Row3 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            Reference<RowCursor> tempReference_mapScope2 =
+                new Reference<RowCursor>(mapScope);
+            Reference<RowCursor> tempReference_tempCursor =
+                new Reference<RowCursor>(tempCursor);
+            ResultAssert.IsSuccess(t.<LayoutTypedMap>TypeAs().MoveField(tempReference_Row3, tempReference_mapScope2,
+                tempReference_tempCursor));
+            tempCursor = tempReference_tempCursor.get();
+            mapScope = tempReference_mapScope2.get();
+            dispatcher.get().argValue.Row = tempReference_Row3.get();
         }
     }
 
-    public void DispatchNullable(RefObject<RowOperationDispatcher> dispatcher,
-                                 RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchNullable(Reference<RowOperationDispatcher> dispatcher,
+                                 Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                                  Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor nullableScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(),
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(t.<LayoutNullable>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(),
             value != null, out nullableScope));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         if (value != null) {
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref nullableScope, null, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), value);
         }
     }
 
-    public void DispatchObject(RefObject<RowOperationDispatcher> dispatcher,
-                               RefObject<RowCursor> scope) {
+    public void DispatchObject(Reference<RowOperationDispatcher> dispatcher,
+                               Reference<RowCursor> scope) {
     }
 
-    public void DispatchSet(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchSet(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
         checkArgument(typeArgs.getCount() == 1);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor setScope;
-        OutObject<RowCursor> tempOut_setScope =
-            new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(),
+        Out<RowCursor> tempOut_setScope =
+            new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(),
             tempOut_setScope));
         setScope = tempOut_setScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         List items = (List)value;
         for (Object item : items) {
             String elmPath = UUID.NewGuid().toString();
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
             RowCursor tempCursor;
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-            // cannot be converted using the 'OutObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Out' helper class unless the method is within the code being
             // modified:
-            RowCursor.CreateForAppend(tempRef_Row2, out tempCursor);
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+            RowCursor.CreateForAppend(tempReference_Row2, out tempCursor);
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref tempCursor, elmPath, typeArgs.get(0).getType(),
                 typeArgs.get(0).getTypeArgs().clone(), item);
 
             // Move item into the set.
-            RefObject<RowBuffer> tempRef_Row3 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            RefObject<RowCursor> tempRef_setScope =
-                new RefObject<RowCursor>(setScope);
-            RefObject<RowCursor> tempRef_tempCursor =
-                new RefObject<RowCursor>(tempCursor);
-            ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().MoveField(tempRef_Row3, tempRef_setScope,
-                tempRef_tempCursor));
-            tempCursor = tempRef_tempCursor.get();
-            setScope = tempRef_setScope.get();
-            dispatcher.get().argValue.Row = tempRef_Row3.get();
+            Reference<RowBuffer> tempReference_Row3 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            Reference<RowCursor> tempReference_setScope =
+                new Reference<RowCursor>(setScope);
+            Reference<RowCursor> tempReference_tempCursor =
+                new Reference<RowCursor>(tempCursor);
+            ResultAssert.IsSuccess(t.<LayoutTypedSet>TypeAs().MoveField(tempReference_Row3, tempReference_setScope,
+                tempReference_tempCursor));
+            tempCursor = tempReference_tempCursor.get();
+            setScope = tempReference_setScope.get();
+            dispatcher.get().argValue.Row = tempReference_Row3.get();
         }
     }
 
-    public void DispatchTuple(RefObject<RowOperationDispatcher> dispatcher,
-                              RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchTuple(Reference<RowOperationDispatcher> dispatcher,
+                              Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                               Object value) {
         checkArgument(typeArgs.getCount() >= 2);
 
-        RefObject<RowBuffer> tempRef_Row =
-            new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row =
+            new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor tupleScope;
         // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'out' keyword - these
-        // cannot be converted using the 'OutObject' helper class unless the method is within the code being modified:
-        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(),
+        // cannot be converted using the 'Out' helper class unless the method is within the code being modified:
+        ResultAssert.IsSuccess(t.<LayoutIndexedScope>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(),
             out tupleScope));
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
 
         for (int i = 0; i < typeArgs.getCount(); i++) {
             PropertyInfo valueAccessor = value.getClass().GetProperty(String.format("Item%1$s", i + 1));
             // TODO: C# TO JAVA CONVERTER: The following method call contained an unresolved 'ref' keyword - these
-            // cannot be converted using the 'RefObject' helper class unless the method is within the code being
+            // cannot be converted using the 'Ref' helper class unless the method is within the code being
             // modified:
             dispatcher.get().LayoutCodeSwitch(ref tupleScope, null, typeArgs.get(i).getType(),
                 typeArgs.get(i).getTypeArgs().clone(), valueAccessor.GetValue(value));
-            RefObject<RowBuffer> tempRef_Row2 =
-                new RefObject<RowBuffer>(dispatcher.get().Row);
-            tupleScope.MoveNext(tempRef_Row2);
-            dispatcher.get().argValue.Row = tempRef_Row2.get();
+            Reference<RowBuffer> tempReference_Row2 =
+                new Reference<RowBuffer>(dispatcher.get().Row);
+            tupleScope.MoveNext(tempReference_Row2);
+            dispatcher.get().argValue.Row = tempReference_Row2.get();
         }
     }
 
-    public void DispatchUDT(RefObject<RowOperationDispatcher> dispatcher,
-                            RefObject<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
+    public void DispatchUDT(Reference<RowOperationDispatcher> dispatcher,
+                            Reference<RowCursor> scope, LayoutType t, TypeArgumentList typeArgs,
                             Object value) {
-        RefObject<RowBuffer> tempRef_Row = new RefObject<RowBuffer>(dispatcher.get().Row);
+        Reference<RowBuffer> tempReference_Row = new Reference<RowBuffer>(dispatcher.get().Row);
         RowCursor udtScope;
-        OutObject<RowCursor> tempOut_udtScope = new OutObject<RowCursor>();
-        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().WriteScope(tempRef_Row, scope, typeArgs.clone(), tempOut_udtScope));
+        Out<RowCursor> tempOut_udtScope = new Out<RowCursor>();
+        ResultAssert.IsSuccess(t.<LayoutUDT>TypeAs().WriteScope(tempReference_Row, scope, typeArgs.clone(), tempOut_udtScope));
         udtScope = tempOut_udtScope.get();
-        dispatcher.get().argValue.Row = tempRef_Row.get();
+        dispatcher.get().argValue.Row = tempReference_Row.get();
         IDispatchable valueDispatcher = value instanceof IDispatchable ? (IDispatchable)value : null;
         assert valueDispatcher != null;
-        RefObject<RowCursor> tempRef_udtScope = new RefObject<RowCursor>(udtScope);
-        valueDispatcher.Dispatch(dispatcher, tempRef_udtScope);
-        udtScope = tempRef_udtScope.get();
+        Reference<RowCursor> tempReference_udtScope = new Reference<RowCursor>(udtScope);
+        valueDispatcher.Dispatch(dispatcher, tempReference_udtScope);
+        udtScope = tempReference_udtScope.get();
     }
 }
\ No newline at end of file
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/AddressSerializer.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/AddressSerializer.java
index 7f800c5..5d60bf7 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/AddressSerializer.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/AddressSerializer.java
@@ -4,20 +4,21 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit.customerschema;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import azure.data.cosmos.serialization.hybridrow.unit.*;
 import com.azure.data.cosmos.serialization.hybridrow.io.RowReader;
 
 public final class AddressSerializer {
-    public static Result Read(RefObject<RowReader> reader, OutObject<Address> obj) {
+    public static Result Read(Reference<RowReader> reader, Out<Address> obj) {
         obj.set(new Address());
         while (reader.get().Read()) {
             Result r;
             switch (reader.get().getPath()) {
                 case "street":
-                    OutObject<String> tempOut_Street = new OutObject<String>();
+                    Out<String> tempOut_Street = new Out<String>();
                     r = reader.get().ReadString(tempOut_Street);
                     obj.get().argValue.Street = tempOut_Street.get();
                     if (r != Result.Success) {
@@ -26,7 +27,7 @@ public final class AddressSerializer {
 
                     break;
                 case "city":
-                    OutObject<String> tempOut_City = new OutObject<String>();
+                    Out<String> tempOut_City = new Out<String>();
                     r = reader.get().ReadString(tempOut_City);
                     obj.get().argValue.City = tempOut_City.get();
                     if (r != Result.Success) {
@@ -35,7 +36,7 @@ public final class AddressSerializer {
 
                     break;
                 case "state":
-                    OutObject<String> tempOut_State = new OutObject<String>();
+                    Out<String> tempOut_State = new Out<String>();
                     r = reader.get().ReadString(tempOut_State);
                     obj.get().argValue.State = tempOut_State.get();
                     if (r != Result.Success) {
@@ -44,13 +45,13 @@ public final class AddressSerializer {
 
                     break;
                 case "postal_code":
-                    RefObject<RowReader> tempRef_child =
-                        new RefObject<RowReader>(child);
-                    OutObject<PostalCode> tempOut_PostalCode = new OutObject<PostalCode>();
+                    Reference<RowReader> tempReference_child =
+                        new Reference<RowReader>(child);
+                    Out<PostalCode> tempOut_PostalCode = new Out<PostalCode>();
                     // TODO: C# TO JAVA CONVERTER: The following lambda contained an unresolved 'ref' keyword - these are not converted by C# to Java Converter:
-                    r = reader.get().ReadScope(obj.get(), (ref RowReader child, Address parent) -> PostalCodeSerializer.Read(tempRef_child, tempOut_PostalCode));
+                    r = reader.get().ReadScope(obj.get(), (ref RowReader child, Address parent) -> PostalCodeSerializer.Read(tempReference_child, tempOut_PostalCode));
                     parent.PostalCode = tempOut_PostalCode.get();
-                    child = tempRef_child.get();
+                    child = tempReference_child.get();
 
                     if (r != Result.Success) {
                         return r;
@@ -63,7 +64,7 @@ public final class AddressSerializer {
         return Result.Success;
     }
 
-    public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg, Address obj) {
+    public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg, Address obj) {
         Result r;
         if (obj.Street != null) {
             r = writer.get().WriteString("street", obj.Street);
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/PostalCodeSerializer.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/PostalCodeSerializer.java
index 0fdac89..8ad8821 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/PostalCodeSerializer.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/customerschema/PostalCodeSerializer.java
@@ -4,8 +4,9 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit.customerschema;
 
-import com.azure.data.cosmos.core.OutObject;
-import com.azure.data.cosmos.core.RefObject;
+import com.azure.data.cosmos.core.Out;
+import com.azure.data.cosmos.core.Reference;
+import com.azure.data.cosmos.core.Reference;
 import com.azure.data.cosmos.serialization.hybridrow.Result;
 import com.azure.data.cosmos.serialization.hybridrow.SchemaId;
 import com.azure.data.cosmos.serialization.hybridrow.io.RowReader;
@@ -22,13 +23,13 @@ import azure.data.cosmos.serialization.hybridrow.unit.*;
 public final class PostalCodeSerializer {
     public static TypeArgument TypeArg = new TypeArgument(LayoutType.UDT, new TypeArgumentList(new SchemaId(1)));
 
-    public static Result Read(RefObject<RowReader> reader, OutObject<PostalCode> obj) {
+    public static Result Read(Reference<RowReader> reader, Out<PostalCode> obj) {
         obj.set(new PostalCode());
         while (reader.get().Read()) {
             Result r;
             switch (reader.get().getPath()) {
                 case "zip":
-                    OutObject<Integer> tempOut_Zip = new OutObject<Integer>();
+                    Out<Integer> tempOut_Zip = new Out<Integer>();
                     r = reader.get().ReadInt32(tempOut_Zip);
                     obj.get().argValue.Zip = tempOut_Zip.get();
                     if (r != Result.Success) {
@@ -38,7 +39,7 @@ public final class PostalCodeSerializer {
                     break;
                 case "plus4":
                     short value;
-                    OutObject<Short> tempOut_value = new OutObject<Short>();
+                    Out<Short> tempOut_value = new Out<Short>();
                     r = reader.get().ReadInt16(tempOut_value);
                     value = tempOut_value.get();
                     if (r != Result.Success) {
@@ -53,7 +54,7 @@ public final class PostalCodeSerializer {
         return Result.Success;
     }
 
-    public static Result Write(RefObject<RowWriter> writer, TypeArgument typeArg, PostalCode obj) {
+    public static Result Write(Reference<RowWriter> writer, TypeArgument typeArg, PostalCode obj) {
         Result r;
         r = writer.get().WriteInt32("zip", obj.Zip);
         if (r != Result.Success) {
diff --git a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/internal/MurmurHash3UnitTests.java b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/internal/MurmurHash3UnitTests.java
index e7d2d00..bf0212d 100644
--- a/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/internal/MurmurHash3UnitTests.java
+++ b/jre/src/test/java/com/azure/data/cosmos/serialization/hybridrow/unit/internal/MurmurHash3UnitTests.java
@@ -4,7 +4,7 @@
 
 package com.azure.data.cosmos.serialization.hybridrow.unit.internal;
 
-import com.azure.data.cosmos.serialization.hybridrow.internal.MurmurHash3;
+import com.azure.data.cosmos.serialization.hybridrow.internal.Murmur3Hash;
 
 import java.util.Random;
 
@@ -31,45 +31,45 @@ public class MurmurHash3UnitTests {
     // 0x0EB26F6D1CCEB258UL), (0xA3B6D57EBEB965D1UL, 0xE8078FCC5D8C2E3EUL), (0x91ABF587B38224F6UL,
     // 0x35899665A8A9252CUL), (0xF05B1AF0487EE2D4UL, 0x5D7496C1665DDE12UL)};
 
-    private static final MurmurHash3.Value[] EXPECTED_VALUES = new MurmurHash3.Value[] {
-        new MurmurHash3.Value(0x56F1549659CBEE1AL, 0xCEB3EE124C3E3855L),
-        new MurmurHash3.Value(0xFE84B58886F9D717L, 0xD24C5DE024F5EA6BL),
-        new MurmurHash3.Value(0x89F6250648BB11BFL, 0x95595FB9D4CF58B0L),
-        new MurmurHash3.Value(0xC76AFDB39EDC6262L, 0xB9286AF4FADAF497L),
-        new MurmurHash3.Value(0xC2CB4D9B3C9C247EL, 0xB465D40116B8B7A2L),
-        new MurmurHash3.Value(0x317178F5B26D0B35L, 0x1D564F53E2E468ADL),
-        new MurmurHash3.Value(0xE8D75F7C05F43F09L, 0xA81CEA052AE92D6FL),
-        new MurmurHash3.Value(0x8F837665508C08A8L, 0x2A74E6E47E5497BCL),
-        new MurmurHash3.Value(0x609778FDA1AFD731L, 0x3EB1A0E3BFC653E4L),
-        new MurmurHash3.Value(0x0F59B8965FA49D1AL, 0xCB3BC158243A5DEEL),
-        new MurmurHash3.Value(0x7A6D0AC9C98F5908L, 0xBC93D3042C3E7178L),
-        new MurmurHash3.Value(0x863FE5AEBA9A3DFAL, 0xDF42416658CB87C5L),
-        new MurmurHash3.Value(0xDB4C82337C8FB216L, 0xCA7616B64ABF6B3DL),
-        new MurmurHash3.Value(0x0049223177425B48L, 0x25510D7246BC3C2CL),
-        new MurmurHash3.Value(0x31AC129B24F82CABL, 0xCD7174C2040E9834L),
-        new MurmurHash3.Value(0xCE39465288116345L, 0x1CE6A26BA2E9E67DL),
-        new MurmurHash3.Value(0xD2BE55791E13DB17L, 0xCF30BF3D93B3A9FAL),
-        new MurmurHash3.Value(0x43E323DD0F079145L, 0xF06721555571ABBAL),
-        new MurmurHash3.Value(0xB0CE9F170A96F5BCL, 0x18EE95960369D702L),
-        new MurmurHash3.Value(0xBFFAF6BEBC84A2A9L, 0xE0612B6FC0C9D502L),
-        new MurmurHash3.Value(0x33E2D699697BC2DAL, 0xB7E9CD6313DE05EEL),
-        new MurmurHash3.Value(0xCBFD7D8DA2A962BFL, 0xCF4C281A7750E88AL),
-        new MurmurHash3.Value(0xBD8D863F83863088L, 0x01AFFBDE3D405D35L),
-        new MurmurHash3.Value(0xBA2E05DF3328C7DBL, 0x9620867ADDFE6579L),
-        new MurmurHash3.Value(0xC57BD1FB63CA0947L, 0xE1391F8454D4EA9FL),
-        new MurmurHash3.Value(0x6AB710460A5BF9BAL, 0x11D7E13FBEF63775L),
-        new MurmurHash3.Value(0x55C2C7C95F41C483L, 0xA4DCC9F547A89563L),
-        new MurmurHash3.Value(0x8AA5A2031027F216L, 0x1653FC7AD6CC6104L),
-        new MurmurHash3.Value(0xAD8A899FF093D9A5L, 0x0EB26F6D1CCEB258L),
-        new MurmurHash3.Value(0xA3B6D57EBEB965D1L, 0xE8078FCC5D8C2E3EL),
-        new MurmurHash3.Value(0x91ABF587B38224F6L, 0x35899665A8A9252CL),
-        new MurmurHash3.Value(0xF05B1AF0487EE2D4L, 0x5D7496C1665DDE12L) };
+    private static final Murmur3Hash.Code[] EXPECTED_VALUES = new Murmur3Hash.Code[] {
+        new Murmur3Hash.Code(0x56F1549659CBEE1AL, 0xCEB3EE124C3E3855L),
+        new Murmur3Hash.Code(0xFE84B58886F9D717L, 0xD24C5DE024F5EA6BL),
+        new Murmur3Hash.Code(0x89F6250648BB11BFL, 0x95595FB9D4CF58B0L),
+        new Murmur3Hash.Code(0xC76AFDB39EDC6262L, 0xB9286AF4FADAF497L),
+        new Murmur3Hash.Code(0xC2CB4D9B3C9C247EL, 0xB465D40116B8B7A2L),
+        new Murmur3Hash.Code(0x317178F5B26D0B35L, 0x1D564F53E2E468ADL),
+        new Murmur3Hash.Code(0xE8D75F7C05F43F09L, 0xA81CEA052AE92D6FL),
+        new Murmur3Hash.Code(0x8F837665508C08A8L, 0x2A74E6E47E5497BCL),
+        new Murmur3Hash.Code(0x609778FDA1AFD731L, 0x3EB1A0E3BFC653E4L),
+        new Murmur3Hash.Code(0x0F59B8965FA49D1AL, 0xCB3BC158243A5DEEL),
+        new Murmur3Hash.Code(0x7A6D0AC9C98F5908L, 0xBC93D3042C3E7178L),
+        new Murmur3Hash.Code(0x863FE5AEBA9A3DFAL, 0xDF42416658CB87C5L),
+        new Murmur3Hash.Code(0xDB4C82337C8FB216L, 0xCA7616B64ABF6B3DL),
+        new Murmur3Hash.Code(0x0049223177425B48L, 0x25510D7246BC3C2CL),
+        new Murmur3Hash.Code(0x31AC129B24F82CABL, 0xCD7174C2040E9834L),
+        new Murmur3Hash.Code(0xCE39465288116345L, 0x1CE6A26BA2E9E67DL),
+        new Murmur3Hash.Code(0xD2BE55791E13DB17L, 0xCF30BF3D93B3A9FAL),
+        new Murmur3Hash.Code(0x43E323DD0F079145L, 0xF06721555571ABBAL),
+        new Murmur3Hash.Code(0xB0CE9F170A96F5BCL, 0x18EE95960369D702L),
+        new Murmur3Hash.Code(0xBFFAF6BEBC84A2A9L, 0xE0612B6FC0C9D502L),
+        new Murmur3Hash.Code(0x33E2D699697BC2DAL, 0xB7E9CD6313DE05EEL),
+        new Murmur3Hash.Code(0xCBFD7D8DA2A962BFL, 0xCF4C281A7750E88AL),
+        new Murmur3Hash.Code(0xBD8D863F83863088L, 0x01AFFBDE3D405D35L),
+        new Murmur3Hash.Code(0xBA2E05DF3328C7DBL, 0x9620867ADDFE6579L),
+        new Murmur3Hash.Code(0xC57BD1FB63CA0947L, 0xE1391F8454D4EA9FL),
+        new Murmur3Hash.Code(0x6AB710460A5BF9BAL, 0x11D7E13FBEF63775L),
+        new Murmur3Hash.Code(0x55C2C7C95F41C483L, 0xA4DCC9F547A89563L),
+        new Murmur3Hash.Code(0x8AA5A2031027F216L, 0x1653FC7AD6CC6104L),
+        new Murmur3Hash.Code(0xAD8A899FF093D9A5L, 0x0EB26F6D1CCEB258L),
+        new Murmur3Hash.Code(0xA3B6D57EBEB965D1L, 0xE8078FCC5D8C2E3EL),
+        new Murmur3Hash.Code(0x91ABF587B38224F6L, 0x35899665A8A9252CL),
+        new Murmur3Hash.Code(0xF05B1AF0487EE2D4L, 0x5D7496C1665DDE12L) };
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
     //   ORIGINAL LINE:
     //   [TestMethod][Owner("jthunter")] public void Hash128Check()
     public final void Hash128Check() {
-        // Generate deterministic data for which the MurmurHash3 is known (see Expected).
+        // Generate deterministic data for which the Murmur3Hash is known (see Expected).
         Random rand = new Random(42);
         //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
         //ORIGINAL LINE: byte[][] samples = new byte[MurmurHash3UnitTests.Expected.Length][];
@@ -88,7 +88,7 @@ public class MurmurHash3UnitTests {
             //ORIGINAL LINE: byte[] sample = samples[i];
             byte[] sample = samples[i];
             // TODO: C# TO JAVA CONVERTER: Java has no equivalent to C# deconstruction declarations:
-            ( long low, long high) = MurmurHash3.Hash128(sample, (0, 0))
+            ( long low, long high) = Murmur3Hash.Hash128(sample, (0, 0))
             System.out.println(String.format("(0x%016XUL, 0x%1.16XUL),", high, low));
             assert MurmurHash3UnitTests.EXPECTED_VALUES[i].high == high;
             assert MurmurHash3UnitTests.EXPECTED_VALUES[i].low == low;
@@ -96,7 +96,7 @@ public class MurmurHash3UnitTests {
 
         // Measure performance.
         long ticks = MurmurHash3UnitTests.MeasureLoop(samples);
-        System.out.println(String.format("MurmurHash3: %1$s", ticks));
+        System.out.println(String.format("Murmur3Hash: %1$s", ticks));
     }
 
     // TODO: C# TO JAVA CONVERTER: Java annotations will not correspond to .NET attributes:
@@ -117,7 +117,7 @@ public class MurmurHash3UnitTests {
             //C# TO JAVA CONVERTER WARNING: Unsigned integer types have no direct equivalent in Java:
             //ORIGINAL LINE: foreach (byte[] sample in samples)
             for (byte[] sample : samples) {
-                MurmurHash3.Hash128(sample, (0, 0))
+                Murmur3Hash.Hash128(sample, (0, 0))
             }
         }